Author: jajcus Date: Mon May 9 09:24:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 5.1.0-beta2 (beta, but recommended by the author)
- build from sources
---- Files affected:
packages/tigase-server:
tigase-server-paths.patch (1.1 -> 1.2) , tigase-server-start_script.patch
(1.1 -> 1.2) , tigase-server.init (1.2 -> 1.3) , tigase-server.spec (1.2 ->
1.3) , tigase-server-no_bash.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/tigase-server/tigase-server-paths.patch
diff -u packages/tigase-server/tigase-server-paths.patch:1.1
packages/tigase-server/tigase-server-paths.patch:1.2
--- packages/tigase-server/tigase-server-paths.patch:1.1 Thu May 5
16:08:37 2011
+++ packages/tigase-server/tigase-server-paths.patch Mon May 9 11:23:58 2011
@@ -1,17 +1,21 @@
-diff -dur tigase-server-5.0.0-b2135.orig/etc/init.properties
tigase-server-5.0.0-b2135/etc/init.properties
---- tigase-server-5.0.0-b2135.orig/etc/init.properties 2010-03-20
22:06:06.000000000 +0100
-+++ tigase-server-5.0.0-b2135/etc/init.properties 2011-05-05
14:28:15.000000000 +0200
-@@ -2,4 +2,6 @@
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/etc/init.properties
tigase-server-5.1.0-beta2-b2555.src/etc/init.properties
+--- tigase-server-5.1.0-beta2-b2555.src.orig/etc/init.properties
2008-10-28 22:43:21.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/etc/init.properties 2011-05-09
11:03:59.000000000 +0200
+@@ -2,4 +2,10 @@
--admins=admin@$HOST_NAME
--virt-hosts = $HOST_NAME
--debug=server
-
++--script-dir=/var/lib/tigase-server/scripts
++--ssl-certs-location=/etc/tigase-server/certs
++basic-conf/logging/java.util.logging.FileHandler.limit=100000000
++basic-conf/logging/java.util.logging.FileHandler.count=20
++basic-conf/logging/java.util.logging.FileHandler.pattern=/var/log/tigase-server/tigase.log
+--user-db=derby
+--user-db-uri=jdbc:derby:/var/lib/tigase-server/derby
-+--script-dir=/var/lib/tigase-server/scripts
-diff -dur tigase-server-5.0.0-b2135.orig/etc/tigase.conf
tigase-server-5.0.0-b2135/etc/tigase.conf
---- tigase-server-5.0.0-b2135.orig/etc/tigase.conf 2010-03-20
22:06:06.000000000 +0100
-+++ tigase-server-5.0.0-b2135/etc/tigase.conf 2011-05-05 14:29:00.000000000
+0200
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/etc/tigase.conf
tigase-server-5.1.0-beta2-b2555.src/etc/tigase.conf
+--- tigase-server-5.1.0-beta2-b2555.src.orig/etc/tigase.conf 2009-11-11
17:31:40.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/etc/tigase.conf 2011-05-09
10:51:10.000000000 +0200
@@ -1,8 +1,7 @@
ENC="-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8"
DRV="-Djdbc.drivers=com.mysql.jdbc.Driver:org.postgresql.Driver:org.apache.derby.jdbc.EmbeddedDriver"
@@ -23,3 +27,80 @@
-TIGASE_CONFIG="etc/tigase.xml"
-TIGASE_OPTIONS=" --property-file etc/init.properties "
+TIGASE_OPTIONS=" --property-file /etc/tigase-server/init.properties "
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/config.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/config.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/config.sh 2007-07-18
19:38:28.000000000 +0200
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/config.sh 2011-05-09
10:56:44.000000000 +0200
+@@ -21,6 +21,6 @@
+ ## $Date$
+ ##
+
+-CP="jars/tigase-server.jar:/usr/share/jdbc-mysql/lib/jdbc-mysql.jar:libs/tigase-xmltools.jar:libs/tigase-utils.jar"
+-
+-java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -cp $CP
tigase.conf.Configurator $*
++CP="jars/tigase-server.jar:/usr/share/java/mysql-connector-java.jar:/usr/share/java/postgresql.jar:/usr/share/java/tigase-xmltools.jar:/usr/share/java/tigase-utils.jar"
++cd /usr/share/tigase-server/
++java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -cp $CP
tigase.conf.Configurator $*
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/derby-db-create.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/derby-db-create.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/derby-db-create.sh
2009-02-03 23:17:44.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/derby-db-create.sh
2011-05-09 10:58:55.000000000 +0200
+@@ -4,16 +4,20 @@
+ echo "Give me a path to the location where you want to have the database
created" && \
+ exit 1
+
++# make it absolute
++path=$(readlink -m "$1")
+
+-java -Dij.protocol=jdbc:derby: -Dij.database="$1;create=true" \
++cd /usr/share/tigase-server || exit 1
++
++java -Dij.protocol=jdbc:derby: -Dij.database="$path;create=true" \
+ -Dderby.system.home=`pwd` \
+ -cp libs/derby.jar:libs/derbytools.jar:jars/tigase-server.jar \
+ org.apache.derby.tools.ij database/derby-schema-4.sql
+-java -Dij.protocol=jdbc:derby: -Dij.database="$1" \
++java -Dij.protocol=jdbc:derby: -Dij.database="$path" \
+ -Dderby.system.home=`pwd` \
+ -cp libs/derby.jar:libs/derbytools.jar:jars/tigase-server.jar \
+ org.apache.derby.tools.ij database/derby-schema-4-sp.schema
+-java -Dij.protocol=jdbc:derby: -Dij.database="$1" \
++java -Dij.protocol=jdbc:derby: -Dij.database="$path" \
+ -Dderby.system.home=`pwd` \
+ -cp libs/derby.jar:libs/derbytools.jar:jars/tigase-server.jar \
+ org.apache.derby.tools.ij database/derby-schema-4-props.sql
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/repo.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/repo.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/repo.sh 2009-02-20
00:18:59.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/repo.sh 2011-05-09
11:01:25.000000000 +0200
+@@ -21,11 +21,13 @@
+ ## $Date$
+ ##
+
+-CP="jars/tigase-server.jar:libs/jdbc-mysql.jar:libs/jdbc-postgresql.jar:libs/tigase-xmltools.jar:libs/tigase-utils.jar"
++CP="jars/tigase-server.jar:/usr/share/java/mysql-connector-java.jar:/usr/share/java/postgresql.jar:/usr/share/java/tigase-xmltools.jar:/usr/share/java/tigase-utils.jar"
+
+ D="-server -Xms100M -Xmx1500M -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
-Djdbc.drivers=com.mysql.jdbc.Driver:org.postgresql.Driver"
+
+ MYSQL_REP="-sc tigase.db.jdbc.JDBCRepository -su
jdbc:mysql://localhost/nk_200k?user=root&password=mypass"
+ PGSQL_REP="-sc tigase.db.jdbc.JDBCRepository -su
jdbc:postgresql://localhost/tigase?user=tigase"
+
++cd /usr/share/tigase-server/
++
+ java $D -cp $CP tigase.util.RepositoryUtils $MYSQL_REP $*
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/user_roster.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/user_roster.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/user_roster.sh
2008-03-02 11:08:28.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/user_roster.sh 2011-05-09
11:02:44.000000000 +0200
+@@ -21,7 +21,7 @@
+ ## $Date$
+ ##
+
+-CP="jars/tigase-server.jar:libs/jdbc-mysql.jar:libs/tigase-xmltools.jar:libs/tigase-utils.jar"
++CP="jars/tigase-server.jar:/usr/share/java/mysql-connector-java.jar:/usr/share/java/postgresql.jar:/usr/share/java/tigase-xmltools.jar:/usr/share/java/tigase-utils.jar"
+
+ D="-server -Xms100M -Xmx1500M -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
-Djdbc.drivers=com.mysql.jdbc.Driver:org.postgresql.Driver"
+
+@@ -30,4 +30,6 @@
+ S_MYSQL_REP="-sc tigase.db.jdbc.JDBCRepository -su
jdbc:mysql://localhost/tigasetest?user=root&password=mypass"
+ S_PGSQL_REP="-sc tigase.db.jdbc.JDBCRepository -su
jdbc:postgresql://localhost/tigase?user=tigase"
+
++cd /usr/share/tigase-server/
++
+ java $D -cp $CP tigase.util.RepositoryUtils $S_MYSQL_REP -u "$1" -pr
================================================================
Index: packages/tigase-server/tigase-server-start_script.patch
diff -u packages/tigase-server/tigase-server-start_script.patch:1.1
packages/tigase-server/tigase-server-start_script.patch:1.2
--- packages/tigase-server/tigase-server-start_script.patch:1.1 Fri May 6
10:42:48 2011
+++ packages/tigase-server/tigase-server-start_script.patch Mon May 9
11:23:58 2011
@@ -1,6 +1,6 @@
-diff -dur tigase-server-5.0.0-b2135.orig/scripts/tigase.sh
tigase-server-5.0.0-b2135/scripts/tigase.sh
---- tigase-server-5.0.0-b2135.orig/scripts/tigase.sh 2010-03-20
22:06:06.000000000 +0100
-+++ tigase-server-5.0.0-b2135/scripts/tigase.sh 2011-05-06
09:47:17.000000000 +0200
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/tigase.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/tigase.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/tigase.sh 2009-10-23
15:51:43.000000000 +0200
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/tigase.sh 2011-05-09
11:19:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -50,7 +50,12 @@
fi
fi
fi
-@@ -137,50 +145,30 @@
+@@ -133,54 +141,34 @@
+
+ [[ -z "${CLASSPATH}" ]] || CLASSPATH="${CLASSPATH}:"
+
+-CLASSPATH="${CLASSPATH}${TIGASE_JAR}"
++CLASSPATH="${CLASSPATH}${TIGASE_JAR}:/usr/share/java/tigase-xmltools.jar:/usr/share/java/tigase-utils.jar:/usr/share/java/mysql-connector-java.jar:/usr/share/java/postgresql.jar"
CLASSPATH="`ls -d ${TIGASE_HOME}/libs/*.jar 2>/dev/null | grep -v wrapper |
tr '\n' :`${CLASSPATH}"
================================================================
Index: packages/tigase-server/tigase-server.init
diff -u packages/tigase-server/tigase-server.init:1.2
packages/tigase-server/tigase-server.init:1.3
--- packages/tigase-server/tigase-server.init:1.2 Fri May 6 10:42:48 2011
+++ packages/tigase-server/tigase-server.init Mon May 9 11:23:58 2011
@@ -16,7 +16,7 @@
init_derby_db () {
show "Initializing Tigase Server derby database: %s" $1 ; started
- if setuidgid -s jabber
/usr/share/tigase-server/scripts/derby-db-create.sh $1 >/dev/null ; then
+ if setuidgid -s jabber /usr/share/tigase-server/bin/derby-db-create.sh
$1 >/dev/null ; then
show "Initializing Tigase Server derby database" ; ok
else
show "Initializing Tigase Server derby database" ; fail
================================================================
Index: packages/tigase-server/tigase-server.spec
diff -u packages/tigase-server/tigase-server.spec:1.2
packages/tigase-server/tigase-server.spec:1.3
--- packages/tigase-server/tigase-server.spec:1.2 Fri May 6 10:42:48 2011
+++ packages/tigase-server/tigase-server.spec Mon May 9 11:23:58 2011
@@ -1,25 +1,40 @@
# $Revision$, $Date$
#
# TODO:
-# - build from sources
+# - fix with_javadoc
+# - fix with_tests (if the test are usable)
+# - use external derby and groovy (make the packages first)
#
+# Conditional build:
+%bcond_with javadoc # build javadoc
+%bcond_without source # don't build source jar
+%bcond_with tests # build and run tests
+
+%include /usr/lib/rpm/macros.java
+
Summary: Open Source Jabber/XMPP Server
Name: tigase-server
-Version: 5.0.0
-%define build_id 2135
-Release: 0.2
+Version: 5.1.0
+%define build_id 2555
+%define beta beta2
+Release: 0.%{beta}.0.1
License: GPL v3
Group: Applications/Communications
-# http://www.tigase.org/content/tigase-downloads?fid=2199
-Source0: %{name}-%{version}-b%{build_id}.tar.gz
-# Source0-md5: e8d305ba1ec59ac7c822c38db6169a7f
+Source0:
https://projects.tigase.org/attachments/download/17/%{name}-%{version}-%{beta}-b%{build_id}.src.tar.gz
+# Source0-md5: 6769b12e74329b5ab854b2b4d542b29a
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.upstart
Source4: derby-db-create.sh
-Patch0: %{name}-paths.patch
-Patch1: %{name}-start_script.patch
+Patch0: %{name}-no_bash.patch
+Patch1: %{name}-paths.patch
+Patch2: %{name}-start_script.patch
URL: http://www.tigase.org/
+%{?with_tests:BuildRequires: ant-junit}
+BuildRequires: java-tigase-utils
+BuildRequires: java-tigase-xmltools
+BuildRequires: jpackage-utils
+BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.228
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
@@ -30,9 +45,13 @@
Provides: group(jabber)
Provides: user(jabber)
Requires(post,preun): /sbin/chkconfig
+Requires: java-tigase-utils
+Requires: java-tigase-xmltools
Requires: jpackage-utils
Requires: jre
Requires: rc-scripts
+Suggests: java-jdbc-mysql
+Suggests: postgresql-jdbc
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,27 +93,99 @@
%description upstart -l pl.UTF-8
Opis zadania Upstart dla %{name}
+%package javadoc
+Summary: Online manual for %{name}
+Summary(pl.UTF-8): Dokumentacja online do %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+Documentation for %{name}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{name}.
+
+%description javadoc -l fr.UTF-8
+Javadoc pour %{name}.
+
+%package source
+Summary: Source code of %{name}
+Summary(pl.UTF-8): Kod źródłowy %{name}
+Group: Documentation
+Requires: jpackage-utils >= 1.7.5-2
+
+%description source
+Source code of %{name}.
+
+%description source -l pl.UTF-8
+Kod źródłowy %{name}.
%prep
-%setup -q -n %{name}-%{version}-b%{build_id}
+%setup -q -n %{name}-%{version}-%{beta}-b%{build_id}.src
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+export JAVA_HOME="%{java_home}"
+
+required_jars="%{?with_tests:junit} tigase-xmltools tigase-utils"
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
+
+%ant prepare-dist jar-dist
+
+%if %{with tests}
+%ant run-unittests
+%endif
+
+%if %{with javadoc}
+%ant docs
+%endif
+
+%if %{with source}
+cd src
+%jar cf ../%{name}.src.jar $(find -name '*.java')
+cd ..
+%endif
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{init,sysconfig,rc.d/init.d},%{_bindir}} \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/{scripts,bin,libs,jars} \
$RPM_BUILD_ROOT/var/lib/%{name}/{derby,scripts} \
$RPM_BUILD_ROOT{%{_sysconfdir},/var/log}/%{name}
-cp -R certs etc/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-ln -s %{_sysconfdir}/%{name}/certs $RPM_BUILD_ROOT%{_datadir}/%{name}
+# jars
+cp -a jars/%{name}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/jars/%{name}.jar
+
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a docs-%{name}/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
+
+# source
+%if %{with source}
+install -d $RPM_BUILD_ROOT%{_javasrcdir}
+cp -a %{name}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{name}.src.jar
+%endif
-cp -R database jars libs $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -R certs etc/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/init-debian.properties
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/init-mysql.properties
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tigase-mysql.conf
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tigase-pgsql.conf
+
+cp -R database $RPM_BUILD_ROOT%{_datadir}/%{name}
+install libs/{derby.jar,groovy-all-*.jar,derbytools.jar,groovy-engine.jar} \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/libs
install scripts/tigase.sh $RPM_BUILD_ROOT%{_bindir}/tigase-server
+install scripts/config.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
+install scripts/derby-db-create.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
+install scripts/machine-check.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
ln -s /var/log/tigase $RPM_BUILD_ROOT%{_datadir}/%{name}/logs
ln -s logs/derby.log $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -102,8 +193,6 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-install %{SOURCE4}
$RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/derby-db-create.sh
-
touch $RPM_BUILD_ROOT/var/log/%{name}/derby.log
@@ -135,15 +224,20 @@
%files
%defattr(644,root,root,755)
-%doc ChangeLog README package.html docs/api scripts/repo.sh
+%doc package.html scripts/{repo.sh,user_roster.sh}
+%doc etc/{init-mysql.properties,tigase-mysql.conf,tigase-pgsql.conf}
%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/bosh-extra-haders.txt
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/cross-domain-policy.xml
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/init.properties
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/jmx.access
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/jmx.password
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.acl
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/tigase.conf
%dir %{_sysconfdir}/%{name}/certs
%attr(770,root,jabber) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/certs/*
%attr(755,root,root) %{_bindir}/*
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/certs
%dir %{_datadir}/%{name}/database
%{_datadir}/%{name}/database/*
%{_datadir}/%{name}/derby.log
@@ -153,7 +247,8 @@
%{_datadir}/%{name}/libs/*.jar
%{_datadir}/%{name}/logs
%dir %{_datadir}/%{name}/scripts
-%attr(755,root,root) %{_datadir}/%{name}/scripts/*.sh
+%dir %{_datadir}/%{name}/bin
+%attr(755,root,root) %{_datadir}/%{name}/bin/*.sh
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%dir %attr(775,root,jabber) /var/log/%{name}
@@ -164,12 +259,29 @@
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+%endif
+
+%if %{with source}
+%files source
+%defattr(644,root,root,755)
+%{_javasrcdir}/%{name}.src.jar
+%endif
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/05/09 09:23:58 jajcus
+- Version: 5.1.0-beta2 (beta, but recommended by the author)
+- build from sources
+
Revision 1.2 2011/05/06 08:42:48 jajcus
- patch provided startup script instead of providing our own
- Release: 0.2
================================================================
Index: packages/tigase-server/tigase-server-no_bash.patch
diff -u /dev/null packages/tigase-server/tigase-server-no_bash.patch:1.1
--- /dev/null Mon May 9 11:24:03 2011
+++ packages/tigase-server/tigase-server-no_bash.patch Mon May 9 11:23:58 2011
@@ -0,0 +1,76 @@
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/config.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/config.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/config.sh 2007-07-18
19:38:28.000000000 +0200
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/config.sh 2011-05-09
11:05:07.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##
+ ## Tigase Jabber/XMPP Server
+ ## Copyright (C) 2004-2007 "Artur Hefczyc" <[email protected]>
+@@ -23,4 +23,4 @@
+
+
CP="jars/tigase-server.jar:/usr/share/jdbc-mysql/lib/jdbc-mysql.jar:libs/tigase-xmltools.jar:libs/tigase-utils.jar"
+
+-java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -cp $CP
tigase.conf.Configurator $*
+\ No newline at end of file
++java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -cp $CP
tigase.conf.Configurator $*
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/derby-db-create.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/derby-db-create.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/derby-db-create.sh
2009-02-03 23:17:44.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/derby-db-create.sh
2011-05-09 11:05:30.000000000 +0200
+@@ -1,6 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
+
+-[[ "$1" = "" ]] && \
++[ -z "$1" ] && \
+ echo "Give me a path to the location where you want to have the database
created" && \
+ exit 1
+
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/machine-check.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/machine-check.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/machine-check.sh
2010-09-08 18:35:44.000000000 +0200
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/machine-check.sh
2011-05-09 11:05:58.000000000 +0200
+@@ -1,6 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
+
+-function usage() {
++usage() {
+ echo "The script has to be run with following parameters:"
+ echo "$0 hostname username [vhost]"
+ echo "--------------------"
+@@ -9,7 +9,7 @@
+ echo " vhost - is a virtual hostname used for the service if different
than the hostname"
+ }
+
+-function check_dns() {
++check_dns() {
+ if host $1 | grep "not found" > /dev/null ; then
+ echo "WARNING - the $1 does NOT resolve to a valid IP address"
+ else
+@@ -31,7 +31,7 @@
+ fi
+ }
+
+-function check_net() {
++check_net() {
+ if ping -q -c 2 -W 100 $1 &> /dev/null ; then
+ echo "OK, The $1 host accessible through the network"
+ else
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/repo.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/repo.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/repo.sh 2009-02-20
00:18:59.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/repo.sh 2011-05-09
11:06:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##
+ ## Tigase Jabber/XMPP Server
+ ## Copyright (C) 2004-2007 "Artur Hefczyc" <[email protected]>
+diff -dur tigase-server-5.1.0-beta2-b2555.src.orig/scripts/user_roster.sh
tigase-server-5.1.0-beta2-b2555.src/scripts/user_roster.sh
+--- tigase-server-5.1.0-beta2-b2555.src.orig/scripts/user_roster.sh
2008-03-02 11:08:28.000000000 +0100
++++ tigase-server-5.1.0-beta2-b2555.src/scripts/user_roster.sh 2011-05-09
11:06:59.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##
+ ## Tigase Jabber/XMPP Server
+ ## Copyright (C) 2004-2007 "Artur Hefczyc" <[email protected]>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server-paths.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server-start_script.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server.init?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
