rpms/openser/EL-5 openser--openser_init.diff, NONE, 1.1 openser-1.3.4-openssl10.patch, NONE, 1.1 import.log, 1.3, 1.4 openser.spec, 1.22, 1.23
Peter Lemenkov
peter at fedoraproject.org
Thu Nov 12 15:13:44 UTC 2009
- Previous message (by thread): rpms/openser/F-10 openser--openser_init.diff, NONE, 1.1 openser-1.3.4-openssl10.patch, NONE, 1.1 import.log, 1.5, 1.6 openser.spec, 1.26, 1.27
- Next message (by thread): rpms/xorg-x11-drv-nv/devel nv-2.1.15-g80-update.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.94, 1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/openser/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6428/EL-5
Modified Files:
import.log openser.spec
Added Files:
openser--openser_init.diff openser-1.3.4-openssl10.patch
Log Message:
Fixed init-script and added COPYING file
openser--openser_init.diff:
openser.init | 46 ++++++++++++++++++++++++++++++++++------------
1 file changed, 34 insertions(+), 12 deletions(-)
--- NEW FILE openser--openser_init.diff ---
--- packaging/fedora/openser.init~ 2008-11-24 23:52:32.000000000 +0300
+++ packaging/fedora/openser.init 2009-11-11 13:48:52.901723897 +0300
@@ -12,28 +12,50 @@
# Source function library.
. /etc/rc.d/init.d/functions
-oser=/usr/sbin/openser
prog=openser
-RETVAL=0
+oser=/usr/sbin/$prog
+pidfile="/var/run/$prog.pid"
+lockfile="/var/lock/subsys/$prog"
+configfile="/etc/$prog/$prog.cfg"
+
+OPTIONS=""
[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+RETVAL=0
+
start() {
echo -n $"Starting $prog: "
+
+ # check whether OpenSER was already started
+ if pidofproc -p $pidfile > /dev/null 2>&1 ; then
+ echo -n "already running" && warning && echo
+ return 0
+ fi
+
# there is something at end of this output which is needed to
# report proper [ OK ] status in Fedora scripts
- daemon $oser $OPTIONS 2>/dev/null | tail -1
+ daemon $oser -P $pidfile -f $configfile $OPTIONS 2>/dev/null | tail -1
RETVAL=$?
echo
- [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+ [ $RETVAL = 0 ] && touch $lockfile
+ return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
- killproc $oser
+
+ # check whether OpenSER is running
+ if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then
+ echo -n "not running" && warning && echo
+ return 0
+ fi
+
+ killproc -p $pidfile 2> /dev/null
RETVAL=$?
echo
- [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+ return $RETVAL
}
# See how we were called.
@@ -45,22 +67,22 @@
stop
;;
status)
- status $oser
+ status -p $pidfile $prog
RETVAL=$?
;;
- restart)
+ restart|force-reload)
stop
start
;;
- condrestart)
- if [ -f /var/run/openser.pid ] ; then
+ condrestart|try-restart)
+ if [ -f $pidfile ] ; then
stop
start
fi
;;
*)
- echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
- exit 1
+ echo $"Usage: $prog {start|stop|restart|condrestart|status}"
+ RETVAL=2
esac
exit $RETVAL
openser-1.3.4-openssl10.patch:
tls_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openser-1.3.4-openssl10.patch ---
diff -up openser-1.3.4-tls/tls/tls_init.c.openssl openser-1.3.4-tls/tls/tls_init.c
--- openser-1.3.4-tls/tls/tls_init.c.openssl 2008-11-24 21:52:33.000000000 +0100
+++ openser-1.3.4-tls/tls/tls_init.c 2009-08-25 20:18:45.000000000 +0200
@@ -468,8 +468,8 @@ static int check_for_krb(void)
if (xx==NULL)
return -1;
- for( j=0 ; j<M_sk_num(xx->cipher_list) ; j++) {
- SSL_CIPHER *yy = (SSL_CIPHER*)M_sk_value(xx->cipher_list,j);
+ for( j=0 ; j<sk_SSL_CIPHER_num(xx->cipher_list) ; j++) {
+ SSL_CIPHER *yy = sk_SSL_CIPHER_value(xx->cipher_list,j);
if ( yy->id>=SSL3_CK_KRB5_DES_64_CBC_SHA &&
yy->id<=SSL3_CK_KRB5_RC4_40_MD5 ) {
LM_INFO("KRB5 cipher %s found\n", yy->name);
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openser/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 8 Dec 2008 16:32:13 -0000 1.3
+++ import.log 12 Nov 2009 15:13:43 -0000 1.4
@@ -1,3 +1,4 @@
openser-1_3_2-3_fc9:EL-5:openser-1.3.2-3.fc9.src.rpm:1218443047
openser-1_3_3-2_fc9:EL-5:openser-1.3.3-2.fc9.src.rpm:1219918981
openser-1_3_4-1_fc10:EL-5:openser-1.3.4-1.fc10.src.rpm:1228753904
+openser-1_3_4-9_fc11:EL-5:openser-1.3.4-9.fc11.src.rpm:1258038791
Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/EL-5/openser.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- openser.spec 8 Dec 2008 16:32:13 -0000 1.22
+++ openser.spec 12 Nov 2009 15:13:43 -0000 1.23
@@ -10,19 +10,22 @@
Summary: Open Source SIP Server
Name: openser
Version: 1.3.4
-Release: 1%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Daemons
Source0: http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
Source1: %{name}.sysconfig
Patch1: openser--acc_radius_enable.diff
Patch3: openser--openssl-paths.diff
+Patch4: openser-1.3.4-openssl10.patch
+Patch5: openser--openser_init.diff
URL: http://www.kamailio.org/
BuildRequires: expat-devel
BuildRequires: libxml2-devel
BuildRequires: bison
BuildRequires: flex
+BuildRequires: subversion
# needed by snmpstats
BuildRequires: radiusclient-ng-devel
BuildRequires: mysql-devel
@@ -418,12 +421,15 @@ clients.
cp -pRf modules/acc modules/acc_radius
%patch1
%patch3 -p0 -b .openssl
+%patch4 -p1 -b .openssl10
+%patch5 -p0 -b .old_init
%build
LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
exclude_modules="%EXCLUDE_MODULES" \
cfg-target=%{_sysconfdir}/openser/ \
- modules-dir=%{_lib}/openser/modules
+ modules-prefix=%{buildroot}/%{_prefix} \
+ modules-dir=%{_lib}/%{name}/modules
%install
rm -rf $RPM_BUILD_ROOT
@@ -431,7 +437,8 @@ rm -rf $RPM_BUILD_ROOT
exclude_modules="%EXCLUDE_MODULES" \
basedir=%{buildroot} prefix=%{_prefix} \
cfg-prefix=%{buildroot} \
- modules-dir=%{_lib}/openser/modules \
+ modules-prefix=%{buildroot}/%{_prefix} \
+ modules-dir=%{_lib}/%{name}/modules \
DBTEXTON=yes # fixed dbtext documentation installation
cp -pf modules/acc_radius/acc.so \
%{buildroot}/%{_libdir}/openser/modules/acc_radius.so
@@ -439,8 +446,15 @@ chmod 0755 %{buildroot}/%{_libdir}/opens
# clean some things
mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
-mv $RPM_BUILD_ROOT/%{_libdir}/openser/perl/* \
- $RPM_BUILD_ROOT/%{perl_vendorlib}/
+if [ -d "$RPM_BUILD_ROOT/%{_prefix}/perl" ]; then
+ # for fedora>=11
+ mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \
+ $RPM_BUILD_ROOT/%{perl_vendorlib}/
+else
+ # for fedora<=10
+ mv $RPM_BUILD_ROOT/%{_libdir}/openser/perl/* \
+ $RPM_BUILD_ROOT/%{perl_vendorlib}/
+fi
mv $RPM_BUILD_ROOT/%{_sysconfdir}/openser/tls/README \
$RPM_BUILD_ROOT/%{_docdir}/openser/README.tls
rm -f $RPM_BUILD_ROOT%{_docdir}/openser/INSTALL
@@ -526,6 +540,7 @@ fi
%{_mandir}/man8/openserunix.8*
%doc docdir/AUTHORS
+%doc COPYING
%doc docdir/NEWS
%doc docdir/README
%doc docdir/README-MODULES
@@ -837,6 +852,29 @@ fi
%doc docdir/README.xmpp
%changelog
+* Wed Nov 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-9
+- Added patch for the init-script
+- Added COPYING file
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Mar 02 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.3.4-6
+- allow build of this package on fedora<=10
+
+* Sat Feb 28 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.3.4-5
+- fix module path
+
+* Sat Feb 28 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.3.4-3
+- addedd subversion build dependency to avoid svnversion error messages
+- fixed installation of perl modules in rawhide
+
+* Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.4-2
+- Rebuild for new mysql.
+
* Mon Dec 8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-1
- Ver. 1.3.4
- Added sysconfig-file
- Previous message (by thread): rpms/openser/F-10 openser--openser_init.diff, NONE, 1.1 openser-1.3.4-openssl10.patch, NONE, 1.1 import.log, 1.5, 1.6 openser.spec, 1.26, 1.27
- Next message (by thread): rpms/xorg-x11-drv-nv/devel nv-2.1.15-g80-update.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.94, 1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list