rpms/openser/devel openser--openserdbctl.diff, NONE, 1.1 openser.spec, 1.1, 1.2 openser.init, 1.1, NONE
Ján ONDREJ (ondrejj)
fedora-extras-commits at redhat.com
Fri Jan 18 09:50:34 UTC 2008
Author: ondrejj
Update of /cvs/pkgs/rpms/openser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405/devel
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/devel/openser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openser.spec 15 Dec 2007 06:52:05 -0000 1.1
+++ openser.spec 18 Jan 2008 09:49:45 -0000 1.2
@@ -1,15 +1,22 @@
-%define EXCLUDE_MODULES mi_xmlrpc osp
+%if 0%{?rhel}
+# copied from lm_sensors exclusive arch
+%ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64
+%define disable_snmpstats snmpstats
+%endif
+%endif
+
+%define EXCLUDE_MODULES mi_xmlrpc osp %{?disable_snmpstats}
Summary: Open Source SIP Server
Name: openser
Version: 1.3.0
-Release: 1%{?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
@@ -20,8 +27,11 @@
BuildRequires: radiusclient-ng-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
+
# required by snmpstats module
+%ifndef %{?disable_snmpstats}
BuildRequires: lm_sensors-devel
+%endif
BuildRequires: net-snmp-devel
BuildRequires: unixODBC-devel
BuildRequires: openssl-devel
@@ -345,6 +355,7 @@
message really reached its destination as a SMS--or multi-part messages--if
a SIP messages is too long it will be split and sent as multiple SMS.
+%ifndef %{?disable_snmpstats}
%package snmpstats
Summary: SNMP management interface for the OpenSER
Group: System Environment/Daemons
@@ -355,6 +366,7 @@
OpenSER. Specifically, it provides general SNMP queryable scalar statistics,
table representations of more complicated data such as user and contact
information, and alarm monitoring capabilities.
+%endif
%package tlsops
Summary: TLS-relating functions for the OpenSER
@@ -443,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
@@ -770,6 +782,7 @@
%{_libdir}/openser/modules/sms.so
%doc docdir/README.sms
+%ifndef %{?disable_snmpstats}
%files snmpstats
%defattr(-,root,root,-)
%{_libdir}/openser/modules/snmpstats.so
@@ -779,6 +792,7 @@
%{_datadir}/snmp/mibs/OPENSER-SIP-COMMON-MIB
%{_datadir}/snmp/mibs/OPENSER-SIP-SERVER-MIB
%{_datadir}/snmp/mibs/OPENSER-TC
+%endif
%files tlsops
%defattr(-,root,root,-)
@@ -806,6 +820,12 @@
%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}
* Thu Dec 13 2007 Peter Lemenkov <lemenkov at gmail.com> 1.3.0-1
- Final ver. 1.3.0
--- openser.init DELETED ---
More information about the fedora-extras-commits
mailing list