Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at Sun Apr 25 18:54:49 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xl2tpd/xl2tpd.changes 2010-04-22 11:26:42.000000000 +0200 @@ -0,0 +1,304 @@ +------------------------------------------------------------------- +Thu Apr 22 09:23:57 UTC 2010 - aj@suse.de + +- Fix specfile, debug_package will get inserted automatically. +- Do not use license package. + +------------------------------------------------------------------- +Fri Apr 16 15:01:13 CEST 2010 - eri_zaq@please-enter-an-email-address + +- xl2tpd-1.2.4-4 +- Fix init script to stop service correctly +- *.changes +------------------------------------------------------------------- +Mon Mar 15 00:00:00 CET 2010 - k0da@opensuse.org + +- xl2tpd-1.2.4-3 +- avoid a huge overload of duplicated files + +------------------------------------------------------------------- +Thu Mar 11 00:00:00 CET 2010 - k0da@opensuse.org + +- xl2tpd-1.2.4-2 +- xl2tpd-doc-1.2.4-2 +- *-doc package +- cleanup init script + +------------------------------------------------------------------- +Wed Mar 10 00:00:00 CET 2010 - k0da@opensuse.org + +- xl2tpd-1.2.4-1 +- patch for init file + +------------------------------------------------------------------- +Tue Oct 28 00:00:00 CET 2008 - k0da@opensuse.org + +- Adjust build requires + +------------------------------------------------------------------- +Sun Oct 26 00:00:00 CEST 2008 - paul@xelerance.com + +- Updated Suse init scripts and spec file +- Added pfc for pppd's precompiled-active-filter + +------------------------------------------------------------------- +Fri Apr 18 00:00:00 CEST 2008 - paul@xelerance.com + +- Updated Suse init scripts and spec file + +------------------------------------------------------------------- +Tue Jun 26 00:00:00 CEST 2007 - paul@xelerance.com + +- Minor changes to spec file to accomodate new README files + +------------------------------------------------------------------- +Fri Feb 23 00:00:00 CET 2007 - paul@xelerance.com + +- Upgraded to 1.1.08 +- This works around the ppp-2.4.2-6.4 issue of not dying on SIGTERM + +------------------------------------------------------------------- +Mon Feb 19 00:00:00 CET 2007 - paul@xelerance.com + +- Upgraded to 1.1.07 +- Fixes from Tuomo Soini for pidfile handling with Fedora +- Fix hardcoded version for Source in spec file. + +------------------------------------------------------------------- +Thu Dec 7 00:00:00 CET 2006 - paul@xelerance.com + +- Changed space/tab replacing method + +------------------------------------------------------------------- +Wed Dec 6 00:00:00 CET 2006 - paul@xelerance.com + +- Added -p to keep original timestamps +- Added temporary hack to change space/tab in init file. +- Added /sbin/service dependancy + +------------------------------------------------------------------- +Tue Dec 5 00:00:00 CET 2006 - paul@xelerance.com + +- Changed Mr. Karlsen's name to not be a utf8 problem +- Fixed Obosoletes/Provides to be more specific wrt l2tpd. +- Added dist tag which accidentally got deleted. + +------------------------------------------------------------------- +Mon Dec 4 00:00:00 CET 2006 - paul@xelerance.com + +- Rebased spec file on Fedora Extras copy, but using xl2tpd as package name + +------------------------------------------------------------------- +Sun Nov 27 00:00:00 CET 2005 - paul@xelerance.com + +- Pulled up sourceforget.net CVS fixes. +- various debugging added, but debugging should not be on by default. +- async/sync conversion routines must be ready for possibility that the read + will block due to routing loops. +- refactor control socket handling. +- move all logic about pty usage to pty.c. Try ptmx first, if it fails try + legacy ptys +- rename log() to l2tp_log(), as "log" is a math function. +- if we aren't deamonized, then log to stderr. +- added install: and DESTDIR support. + +------------------------------------------------------------------- +Thu Oct 20 00:00:00 CEST 2005 - paul@xelerance.com + +- Removed suse/mandrake specifics. Comply for Fedora Extras guidelines + +------------------------------------------------------------------- +Tue Jun 21 00:00:00 CEST 2005 - jacco2@dds.nl + +- Added log() patch by Paul Wouters so that l2tpd compiles on FC4. + +------------------------------------------------------------------- +Sat Jun 4 00:00:00 CEST 2005 - jacco2@dds.nl + +- l2tpd.org has been hijacked. Project moved back to SourceForge: + http://l2tpd.sourceforge.net + +------------------------------------------------------------------- +Tue May 3 00:00:00 CEST 2005 - jacco2@dds.nl + +- Small Makefile fixes. Explicitly use gcc instead of cc. + Network services library was not linked on Solaris due to typo. + +------------------------------------------------------------------- +Thu Mar 17 00:00:00 CET 2005 - jacco2@dds.nl + +- Choosing between SysV or BSD style ptys is now configurable through + a compile-time boolean "unix98pty". + +------------------------------------------------------------------- +Fri Feb 4 00:00:00 CET 2005 - jacco2@dds.nl + +- Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. + Requires the N_HDLC kernel module. + +------------------------------------------------------------------- +Fri Nov 26 00:00:00 CET 2004 - jacco2@dds.nl + +- Updated the README. + +------------------------------------------------------------------- +Wed Nov 10 00:00:00 CET 2004 - jacco2@dds.nl + +- Patch by Marald Klein and Roger Luethi. Fixes writing PID file. + (http://l2tpd.graffl.net/msg01790.html) + Long overdue. Rereleasing 10jdl. + +------------------------------------------------------------------- +Tue Nov 9 00:00:00 CET 2004 - jacco2@dds.nl + +- [SECURITY FIX] Added fix from Debian because of a bss-based + buffer overflow. + (http://www.mail-archive.com/l2tpd-devel@l2tpd.org/msg01071.html) +- Mandrake's FreeS/WAN, Openswan and Strongswan RPMS use configuration + directories /etc/{freeswan,openswan,strongswan}. Install our + configuration files to /etc/ipsec.d and create symbolic links in + those directories. + +------------------------------------------------------------------- +Wed Aug 18 00:00:00 CEST 2004 - jacco2@dds.nl + +- Removed 'leftnexthop=' lines. Not relevant for recent versions + of FreeS/WAN and derivates. + +------------------------------------------------------------------- +Tue Jan 20 00:00:00 CET 2004 - jacco2@dds.nl + +- Added "noccp" because of too much MPPE/CCP messages sometimes. + +------------------------------------------------------------------- +Wed Dec 31 00:00:00 CET 2003 - jacco2@dds.nl + +- Added patch in order to prevent StopCCN messages. + +------------------------------------------------------------------- +Sat Aug 23 00:00:00 CEST 2003 - jacco2@dds.nl + +- MTU/MRU 1410 seems to be the lowest possible for MSL2TP. + For Windows 2000/XP it doesn't seem to matter. +- Typo in l2tpd.conf (192.168.128/25). + +------------------------------------------------------------------- +Fri Aug 8 00:00:00 CEST 2003 - jacco2@dds.nl + +- Added MTU/MRU 1400 to options.l2tpd. I don't know the optimal + value but some apps had problems with the default value. + +------------------------------------------------------------------- +Fri Aug 1 00:00:00 CEST 2003 - jacco2@dds.nl + +- Added workaround for the missing hostname bug in the MSL2TP client + ('Specify your hostname', error 629: "You have been disconnected + from the computer you are dialing"). + ++++ 107 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/xl2tpd/xl2tpd.changes calling whatdependson for head-i586 New: ---- Makefile.patch xl2tpd-1.2.4.tar.bz2 xl2tpd.changes xl2tpd.init.patch xl2tpd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xl2tpd.spec ++++++ # # spec file for package xl2tpd (Version 1.2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.4 Release: 1 License: GPLv2 Url: http://www.xelerance.com/software/xl2tpd/ Group: Productivity/Networking/System Source0: %{name}-%{version}.tar.bz2 Patch0: Makefile.patch Patch1: xl2tpd.init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ppp %if %sles_version >= 10 BuildRequires: libpcap linux-kernel-headers => 2.6.23 %endif BuildRequires: libpcap-devel linux-kernel-headers Obsoletes: l2tpd <= 0.68 Provides: l2tpd = 0.69 %description xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP servers. Another important application is Virtual Private Networks where the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec, RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and Mac OS X clients. On Linux, xl2tpd can be used in combination with IPsec implementations such as Openswan. Example configuration files for such a setup are included in this RPM. xl2tpd works by opening a pseudo-tty for communicating with pppd. It runs completely in userspace but supports kernel mode L2TP. xl2tpd supports IPsec SA Reference tracking to enable overlapping internak NAT'ed IP's by different clients (eg all clients connecting from their linksys internal IP 192.168.1.101) as well as multiple clients behind the same NAT router. xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher, or via a patch in contrib for 2.4.x kernels. Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm@iglou.com> It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003. %package -n xl2tpd-doc License: GPLv2 Summary: Documentation for xl2tpd package Group: Documentation/Man Version: 1.2.4 Release: 1 AutoReqProv: on %description -n xl2tpd-doc This package contains the documentation for using the xl2tpd daemon %prep %setup -q %patch0 %patch1 %build make DFLAGS="$RPM_OPT_FLAGS" %install export PREFIX=/usr make DESTDIR=%{buildroot} MANDIR=%{buildroot}/%{_mandir} install install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets install -p -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample install -p -D -m755 packaging/suse/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd ln -sf /etc/init.d/xl2tpd $RPM_BUILD_ROOT/%{_sbindir}/rcxl2tpd install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd %clean rm -rf %{buildroot} %post %{fillup_and_insserv xl2tpd} # if we migrate from l2tpd to xl2tpd, copy the configs if [ -f /etc/l2tpd/l2tpd.conf ] then echo "Old /etc/l2tpd configuration found, migrating to /etc/xl2tpd" mv /etc/xl2tpd/xl2tpd.conf /etc/xl2tpd/xl2tpd.conf.rpmsave cat /etc/l2tpd/l2tpd.conf | sed "s/options.l2tpd/options.xl2tpd/" > /etc/xl2tpd/xl2tpd.conf mv /etc/ppp/options.xl2tpd /etc/ppp/options.xl2tpd.rpmsave mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets fi %preun %stop_on_removal xl2tpd exit 0 %postun %restart_on_update xl2tpd %insserv_cleanup exit 0 %files %defattr(-,root,root) %{_sbindir}/rcxl2tpd %{_sbindir}/xl2tpd %{_bindir}/pfc %dir %{_sysconfdir}/xl2tpd %config(noreplace) %{_sysconfdir}/xl2tpd/* %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd %dir %{_localstatedir}/run/xl2tpd %files -n xl2tpd-doc %defattr(-,root,root) %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_mandir}/*/* %changelog ++++++ Makefile.patch ++++++ --- Makefile.orig 2010-03-11 12:36:18.000000000 +0100 +++ Makefile 2010-03-11 13:14:42.000000000 +0100 @@ -47,13 +47,13 @@ # trust pppd. This work around will be removed in the near future. # DFLAGS= -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH -DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE +#DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE # Uncomment the next line for Linux. KERNELSRC is needed for if_pppol2tp.h, # but we use a local copy if we don't find it. # -#KERNELSRC=/lib/modules/`uname -r`/build/ -KERNELSRC?=./linux +KERNELSRC=/lib/modules/`uname -r`/build/ +#KERNELSRC?=./linux OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ # # Uncomment the following to use the kernel interface under Linux @@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include # are packages seperately (eg kernel-headers on Fedora) # Note: 2.6.23+ support still needs some changes in the xl2tpd source # -#OSFLAGS+= -DUSE_KERNEL +OSFLAGS+= -DUSE_KERNEL # # # Uncomment the next line for FreeBSD @@ -97,7 +97,7 @@ SRCS=${OBJS:.o=.c} ${HDRS} #LIBS= $(OSLIBS) # -lefence # efence for malloc checking EXEC=xl2tpd -PREFIX?=/usr/local +PREFIX?=/usr SBINDIR?=$(DESTDIR)${PREFIX}/sbin BINDIR?=$(DESTDIR)${PREFIX}/bin MANDIR?=$(DESTDIR)${PREFIX}/share/man @@ -113,7 +113,7 @@ $(EXEC): $(OBJS) $(HDRS) pfc: $(CC) $(CFLAGS) -c contrib/pfc.c - $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o + $(CC) $(LDFLAGS) $(LDLIBS) -o pfc pfc.o -lpcap romfs: $(ROMFSINST) /bin/$(EXEC) ++++++ xl2tpd.init.patch ++++++ --- packaging/suse/xl2tpd.init.orig 2010-03-11 20:54:49.000000000 +0100 +++ packaging/suse/xl2tpd.init 2010-03-11 21:08:28.000000000 +0100 @@ -17,8 +17,10 @@ # ### BEGIN INIT INFO # Provides: xl2tpd -# Required-Start: $syslog -# Required-Stop: $syslog +# Required-Start: $remote_fs $syslog $network +# Required-Stop: $remote_fs $syslog $network +# Should-Start: ypbind +# Should-Stop: ypbind # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start xl2tpd (to provide L2TP VPN's) @@ -30,19 +32,10 @@ # not real dependencies. Depencies have to be handled by admin # resp. the configuration tools (s)he uses. -# Source SuSE config (if still necessary, most info has been moved) -test -r /etc/rc.config && . /etc/rc.config - # Check for missing binaries (stale symlinks should not happen) XL2TPD_BIN=/usr/sbin/xl2tpd -test -x $YPBIND_BIN || { echo "$YPBIND_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } - -# Check for existence of needed config file and read it -#XL2TPD_CONFIG=/etc/sysconfig/xl2tpd -#test -r $YPBIND_CONFIG || { echo "$YPBIND_CONFIG not existing"; -# if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } -#. $XL2TPD_CONFIG +XL2TPD_PID=/var/run/xl2tpd/xl2tpd.pid +XL2TPD_CONF=/etc/xl2tpd/xl2tpd.conf # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -82,7 +75,7 @@ # NOTE: startproc returns 0, even if service is # already running to match LSB spec. - startproc $XL2TPD_BIN >/dev/null 2>&1 + startproc -p $XL2TPD_PID $XL2TPD_BIN # Remember status and be verbose rc_status -v @@ -92,8 +85,7 @@ ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. - killproc -TERM $XL2TPD_BIN - rm -f /var/run/xl2tpd/xl2tpd.pid + killproc -G -TERM $XL2TPD_BIN # Remember status and be verbose rc_status -v ;; @@ -123,13 +115,8 @@ ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service xl2tpd" - ## if it supports it: killproc -HUP $XL2TPD_BIN - #touch /var/run/xl2tpd/xl2tpd.pid rc_status -v - ## Otherwise: - #$0 stop && $0 start - #rc_status ;; reload) ## Like force-reload, but if daemon does not support @@ -137,7 +124,6 @@ # If it supports signalling: echo -n "Reload service xl2tpd" killproc -HUP $XL2TPD_BIN - #touch /var/run/xl2tpd.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 @@ -162,7 +148,7 @@ ## Optional: Probe for the necessity of a reload, ## print out the argument which is required for a reload. - test /etc/xl2tpd/xl2tpd.conf -nt /var/run/xltpd/xl2tpd.pid && echo reload + test $XL2TPD_CONF -nt $XL2TPD_PID && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de