rpms/openser/devel openser--openserdbctl.diff, 1.1, 1.2 openser.spec, 1.2, 1.3
Ján ONDREJ (ondrejj)
fedora-extras-commits at redhat.com
Fri Jan 25 10:52:26 UTC 2008
Author: ondrejj
Update of /cvs/pkgs/rpms/openser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2615/devel
Modified Files:
openser--openserdbctl.diff openser.spec
Log Message:
Modified and applied patch for openserdbctl
openser--openserdbctl.diff:
Index: openser--openserdbctl.diff
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser--openserdbctl.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openser--openserdbctl.diff 18 Jan 2008 09:49:45 -0000 1.1
+++ openser--openserdbctl.diff 25 Jan 2008 10:52:14 -0000 1.2
@@ -1,12 +1,9 @@
---- scripts/openserdbctl (revision 3518)
-+++ scripts/openserdbctl (working copy)
-@@ -7,37 +7,29 @@
- #===================================================================
+diff -ur openser-1.3.0-tls.orig/scripts/openserdbctl openser-1.3.0-tls/scripts/openserdbctl
+--- openser-1.3.0-tls.orig/scripts/openserdbctl 2007-12-13 14:37:17.000000000 +0100
++++ openser-1.3.0-tls/scripts/openserdbctl 2008-01-25 11:22:27.000000000 +0100
+@@ -10,6 +10,9 @@
- PATH=$PATH:/usr/local/sbin/
-+TEST="false"
--
### include resource files, if any
+if [ -f /etc/openser/openserctlrc ]; then
+ . /etc/openser/openserctlrc
@@ -14,62 +11,3 @@
if [ -f /usr/local/etc/openser/openserctlrc ]; then
. /usr/local/etc/openser/openserctlrc
fi
- if [ -f ~/.openserctlrc ]; then
- . ~/.openserctlrc
- fi
--### for testing only
--if [ -f ./openserctlrc ]; then
-- . ./openserctlrc
-+# for testing only, please don't enable this in production environments
-+# as this introduce security risks
-+if [ $TEST = "true" ]; then
-+ if [ -f ./openserctlrc ]; then
-+ . ./openserctlrc
-+ fi
- fi
-
-
--##### ------------------------------------------------ #####
--### force values for variables in this section
--#
--
--# you better set the variables in ~/.openserctlrc
--
--
--if [ -z "$ETCDIR" ] ; then
-- ETCDIR="/usr/local/etc/openser"
--fi
--
--##### ------------------------------------------------ #####
--###
--#
- ### version for this script
--VERSION='1.3dev - $Revision$'
-+VERSION='$Revision$'
-
- if [ -z "$MYDIR" ] ; then
- MYDIR=`dirname $0`
-@@ -51,13 +43,6 @@
- fi
-
-
--# force values for variables in this section
--# you better set the variables in ~/.openserctlrc
--if [ -z "$ETCDIR" ] ; then
-- ETCDIR="/usr/local/etc/openser"
--fi
--
--
- ##### ------------------------------------------------ #####
- ### load base functions
- #
-@@ -298,6 +283,9 @@
- openser_berkeley "$@"
- exit $?
- ;;
-+ version)
-+ echo "$0 $VERSION"
-+ ;;
- *)
- usage
- exit 1;
Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openser.spec 18 Jan 2008 09:49:45 -0000 1.2
+++ openser.spec 25 Jan 2008 10:52:14 -0000 1.3
@@ -10,7 +10,7 @@
Summary: Open Source SIP Server
Name: openser
Version: 1.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Daemons
Source0: http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -421,6 +421,7 @@
cp -pRf modules/acc modules/acc_radius
%patch1
%patch3
+%patch4 -p1
%build
LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -820,6 +821,9 @@
%doc docdir/README.xmpp
%changelog
+* Fri Jan 25 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.0-4
+- modify and apply forgotten patch4
+
* Thu Jan 17 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.0-2
- removed openser.init and replaced by upstream version
- fixed configuration path for openserdbctl (#428799)
More information about the fedora-extras-commits
mailing list