rpms/openser/EL-5 openser--openserdbctl.diff, NONE, 1.1 openser.spec, 1.6, 1.7 openser.init, 1.1, NONE

[Ján ONDREJ (ondrejj)]

Author: ondrejj

Update of /cvs/pkgs/rpms/openser/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18701/EL-5

Modified Files:
	openser.spec 
Added Files:
	openser--openserdbctl.diff 
Removed Files:
	openser.init 
Log Message:
Update for bz#428799.



openser--openserdbctl.diff:

--- NEW FILE openser--openserdbctl.diff ---
--- scripts/openserdbctl	(revision 3518)
+++ scripts/openserdbctl	(working copy)
@@ -7,37 +7,29 @@
 #===================================================================
 
 PATH=$PATH:/usr/local/sbin/
+TEST="false"
 
-
 ### include resource files, if any
+if [ -f /etc/openser/openserctlrc ]; then
+	. /etc/openser/openserctlrc
+fi
 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/EL-5/openser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openser.spec	13 Jan 2008 20:13:11 -0000	1.6
+++ openser.spec	18 Jan 2008 09:55:04 -0000	1.7
@@ -10,13 +10,13 @@
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.0
-Release:	1.4%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
-Source1:	openser.init
 Patch1:		openser--acc_radius_enable.diff
 Patch3:		openser--openssl-paths.diff
+Patch4:		openser--openserdbctl.diff
 URL:		http://www.openser.org/
 
 BuildRequires:	expat-devel
@@ -455,7 +455,7 @@
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-%{__install} -p -D -m 755 %{SOURCE1} \
+%{__install} -p -D -m 755 packaging/fedora/openser.init \
   $RPM_BUILD_ROOT%{_initrddir}/openser
 echo -e "\nETCDIR=\"%{_sysconfdir}/openser\"\n" \
   >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/openserctlrc
@@ -820,6 +820,9 @@
 %doc docdir/README.xmpp
 
 %changelog
+* 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)
 
 * Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-1.4
 - 4th try to remove lm_sensors-devel from EL-[45] at ppc{64}


--- openser.init DELETED ---