Author: jajcus Date: Thu Nov 10 19:33:54 2011 GMT Module: packages Tag: HEAD ---- Log message: - Version: 1.3.0 - spec finished - xl2tpd-control patched not to crash when started with no arguments
---- Files affected: packages/xl2tpd: xl2tpd.spec (1.1 -> 1.2) , xl2tpd-build_flags.patch (NONE -> 1.1) (NEW), xl2tpd-control_crash.patch (NONE -> 1.1) (NEW), xl2tpd.init (NONE -> 1.1) (NEW), xl2tpd.sysconfig (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xl2tpd/xl2tpd.spec diff -u packages/xl2tpd/xl2tpd.spec:1.1 packages/xl2tpd/xl2tpd.spec:1.2 --- packages/xl2tpd/xl2tpd.spec:1.1 Sat May 21 01:22:55 2011 +++ packages/xl2tpd/xl2tpd.spec Thu Nov 10 20:33:49 2011 @@ -1,35 +1,24 @@ # $Revision$, $Date$ # -# Conditional build: -%bcond_with tests # build with tests -%bcond_without tests # build without tests -# -Summary: - -Summary(pl.UTF-8): - +Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) +Summary(pl.UTF-8): Demon tunelowania L2TP (RFC 2661) Name: xl2tpd -Version: 1.2.8 -Release: 0.1 +Version: 1.3.0 +Release: 1 License: GPL v2 Group: Networking/Daemons Source0: http://www.xelerance.com/wp-content/uploads/software/xl2tpd/%{name}-%{version}.tar.gz -# Source0-md5: 8748ac5e2f5289963d9a908eede546b5 +# Source0-md5: 28264284552c442b24cf421755a2bb48 +Source1: %{name}.sysconfig +Source2: %{name}.init +Patch0: %{name}-build_flags.patch +Patch1: %{name}-control_crash.patch URL: http://www.xelerance.com/software/xl2tpd/ -%if %{with initscript} BuildRequires: rpmbuild(macros) >= 1.228 +BuildRequires: libpcap-devel Requires(post,preun): /sbin/chkconfig Requires: rc-scripts -%endif -#BuildRequires: - -#Requires(postun): - -#Requires(pre,post): - -#Requires(preun): - -#Requires: - Requires: ppp -#Provides: - -#Provides: group(foo) -#Provides: user(foo) -#Obsoletes: - -#Conflicts: - BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -44,68 +33,59 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %{__make} \ CC="%{__cc}" \ + RPMCFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" \ PREFIX=%{_prefix} %install rm -rf $RPM_BUILD_ROOT -# create directories if necessary -#install -d $RPM_BUILD_ROOT -%if %{with initscript} -install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} -%endif -#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} \ + $RPM_BUILD_ROOT/var/run/%{name} + +install doc/l2tp-secrets.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/l2tp-secrets +install doc/l2tpd.conf.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/xl2tpd.conf %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ PREFIX=%{_prefix} +install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name} +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + %clean rm -rf $RPM_BUILD_ROOT -%if %{with initscript} -%post init +%post /sbin/chkconfig --add %{name} %service %{name} restart -%preun init +%preun if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} + rm -f /var/run/xl2tpd/l2tp-control 2>/dev/null || : fi -%endif %files %defattr(644,root,root,755) -%doc BUGS CREDITS CHANGES TODO -%attr(755,root,root) %{_bindir}/p* -%attr(755,root,root) %{_sbindir}/xl* +%doc BUGS CREDITS CHANGES README.xl2tpd TODO contrib/pfc.README +%attr(755,root,root) %{_bindir}/pfc +%attr(755,root,root) %{_sbindir}/%{name} +%attr(755,root,root) %{_sbindir}/%{name}-control %{_mandir}/man[158]/* - -%if 0 -# if _sysconfdir != /etc: -#%%dir %{_sysconfdir} -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/* -%{_datadir}/%{name} -%endif - -# initscript and its config -%if %{with initscript} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/l2tp-secrets %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} -%endif - -#%{_examplesdir}/%{name}-%{version} - -%if %{with subpackage} -%files subpackage -%defattr(644,root,root,755) -#%doc extras/*.gz -#%{_datadir}/%{name}-ext -%endif +%dir /var/run/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -113,6 +93,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/11/10 19:33:49 jajcus +- Version: 1.3.0 +- spec finished +- xl2tpd-control patched not to crash when started with no arguments + Revision 1.1 2011/05/20 23:22:55 zbyniu - raw ================================================================ Index: packages/xl2tpd/xl2tpd-build_flags.patch diff -u /dev/null packages/xl2tpd/xl2tpd-build_flags.patch:1.1 --- /dev/null Thu Nov 10 20:33:54 2011 +++ packages/xl2tpd/xl2tpd-build_flags.patch Thu Nov 10 20:33:49 2011 @@ -0,0 +1,21 @@ +diff -dur xl2tpd-1.3.0.orig/Makefile xl2tpd-1.3.0/Makefile +--- xl2tpd-1.3.0.orig/Makefile 2011-07-24 02:13:59.000000000 +0200 ++++ xl2tpd-1.3.0/Makefile 2011-11-10 20:27:32.000000000 +0100 +@@ -90,7 +90,7 @@ + + IPFLAGS?= -DIP_ALLOCATION + +-CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS) ++CFLAGS+= $(DFLAGS) $(RPMCFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS) + HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h + OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o + SRCS=${OBJS:.o=.c} ${HDRS} +@@ -114,7 +114,7 @@ + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) + + $(CONTROL_EXEC): $(CONTROL_SRCS) +- $(CC) $(CONTROL_SRCS) -o $@ ++ $(CC) $(RPMCFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@ + + pfc: + $(CC) $(CFLAGS) -c contrib/pfc.c ================================================================ Index: packages/xl2tpd/xl2tpd-control_crash.patch diff -u /dev/null packages/xl2tpd/xl2tpd-control_crash.patch:1.1 --- /dev/null Thu Nov 10 20:33:54 2011 +++ packages/xl2tpd/xl2tpd-control_crash.patch Thu Nov 10 20:33:49 2011 @@ -0,0 +1,12 @@ +diff -dur xl2tpd-1.3.0.orig/xl2tpd-control.c xl2tpd-1.3.0/xl2tpd-control.c +--- xl2tpd-1.3.0.orig/xl2tpd-control.c 2011-07-24 02:13:59.000000000 +0200 ++++ xl2tpd-1.3.0/xl2tpd-control.c 2011-11-10 20:30:35.000000000 +0100 +@@ -96,7 +96,7 @@ + struct command_t* command = NULL; + int i; /* argv iterator */ + +- if (!strncmp (argv[1], "--help", 6)) ++ if (argc < 2 || !strncmp (argv[1], "--help", 6)) + { + help(); + return 0; ================================================================ Index: packages/xl2tpd/xl2tpd.init diff -u /dev/null packages/xl2tpd/xl2tpd.init:1.1 --- /dev/null Thu Nov 10 20:33:54 2011 +++ packages/xl2tpd/xl2tpd.init Thu Nov 10 20:33:49 2011 @@ -0,0 +1,84 @@ +#!/bin/sh +# +# xl2tpd Start/Stop the xl2tpd daemon +# +# chkconfig: 2345 15 85 +# description: xl2tpd is Layer 2 Tunnelling Protocol Daemon (RFC 2661) +# +# processname: xl2tpd +# config: /etc/xl2tpd/xl2tpd.conf +# pidfile: /var/run/xl2tpd.pid + + +# Source function library. +. /etc/rc.d/init.d/functions + +# Get service config +[ -f /etc/sysconfig/xl2tpd ] && . /etc/sysconfig/xl2tpd + +start() { + # Check if the service is already running? + if [ -f /var/lock/subsys/xl2tpd ]; then + msg_already_running "L2TP daemon" + return + fi + + msg_starting "L2TP daemon" + daemon /usr/sbin/xl2tpd -p /var/run/xl2tpd.pid + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xl2tpd +} + +stop() { + if [ ! -f /var/lock/subsys/xl2tpd ]; then + msg_not_running "L2TP daemon" + return + fi + + msg_stopping "L2TP daemon" + killproc xl2tpd + rm -f /var/lock/subsys/xl2tpd +} + +condrestart() { + if [ ! -f /var/lock/subsys/xl2tpd ]; then + msg_not_running "L2TP daemon" + RETVAL=$1 + return + fi + + stop + start +} + +#upstart_controlled + +RETVAL=0 +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + try-restart) + condrestart 0 + ;; + force-reload) + condrestart 7 + ;; + status) + status --pidfile /var/run/xl2tpd.pid xl2tpd + exit $? + ;; + *) + msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}" + exit 3 +esac + +exit $RETVAL ================================================================ Index: packages/xl2tpd/xl2tpd.sysconfig diff -u /dev/null packages/xl2tpd/xl2tpd.sysconfig:1.1 --- /dev/null Thu Nov 10 20:33:54 2011 +++ packages/xl2tpd/xl2tpd.sysconfig Thu Nov 10 20:33:49 2011 @@ -0,0 +1,4 @@ +# Customized settings for xl2tpd + +# Nice level for xl2tpd +SERVICE_RUN_NICE_LEVEL="+0" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xl2tpd/xl2tpd.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
