Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2012-09-03 18:56:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old) and /work/SRC/openSUSE:Factory/.xl2tpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xl2tpd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes 2011-11-21 15:50:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2012-09-03 18:56:54.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 31 21:45:57 UTC 2012 - [email protected] + +- Add systemd support. + +------------------------------------------------------------------- New: ---- xl2tpd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xl2tpd.spec ++++++ --- /var/tmp/diff_new_pack.WtoGP0/_old 2012-09-03 18:56:56.000000000 +0200 +++ /var/tmp/diff_new_pack.WtoGP0/_new 2012-09-03 18:56:56.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xl2tpd (Version 1.2.4) +# spec file for package xl2tpd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,25 +17,34 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) +License: GPL-2.0 +Group: Productivity/Networking/System Name: xl2tpd Version: 1.3.0 -Release: 1 -License: GPL-2.0 +Release: 0 Url: http://www.xelerance.com/software/xl2tpd/ -Group: Productivity/Networking/System Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}.service 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.19 +BuildRequires: libpcap +BuildRequires: linux-kernel-headers => 2.6.19 %endif -BuildRequires: libpcap-devel linux-kernel-headers +BuildRequires: libpcap-devel +BuildRequires: linux-kernel-headers Obsoletes: l2tpd <= 0.68 Provides: l2tpd = 0.69 +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%define has_systemd 1 +%endif + %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 @@ -62,12 +71,10 @@ It was de-facto maintained by Jacco de Leeuw <[email protected]> in 2002 and 2003. %package -n xl2tpd-doc -License: GPL-2.0 Summary: Documentation for xl2tpd package Group: Documentation/Man Version: 1.3.0 -Release: 1 -AutoReqProv: on +Release: 0 %description -n xl2tpd-doc This package contains the documentation for using the xl2tpd daemon @@ -78,7 +85,7 @@ %patch0 %patch1 %build -make DFLAGS="$RPM_OPT_FLAGS" +make DFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS)" %install export PREFIX=/usr @@ -91,9 +98,21 @@ ln -sf /etc/init.d/xl2tpd $RPM_BUILD_ROOT/%{_sbindir}/rcxl2tpd install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd +%if 0%{?has_systemd} +install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service +mkdir -p %{buildroot}/usr/lib/modules-load.d +echo "l2tp_ppp" > %{buildroot}/usr/lib/modules-load.d/%{name}.conf +%endif + %clean rm -rf %{buildroot} +%pre + +%if 0%{?has_systemd} +%service_add_pre %{name}.service +%endif + %post %{fillup_and_insserv xl2tpd} @@ -110,14 +129,24 @@ fi +%if 0%{?has_systemd} +%service_add_post %{name}.service +%endif + %preun %stop_on_removal xl2tpd -exit 0 + +%if 0%{?has_systemd} +%service_del_preun %{name}.service +%endif %postun %restart_on_update xl2tpd %insserv_cleanup -exit 0 + +%if 0%{?has_systemd} +%service_del_postun %{name}.service +%endif %files %defattr(-,root,root) @@ -130,7 +159,10 @@ %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd %ghost %{_localstatedir}/run/xl2tpd - +%if 0%{?has_systemd} +%{_unitdir}/%{name}.service +/usr/lib/modules-load.d/%{name}.conf +%endif %files -n xl2tpd-doc %defattr(-,root,root) %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt ++++++ xl2tpd.service ++++++ [Unit] Description=Level 2 Tunnel Protocol Daemon (L2TP) After=syslog.target network.target After=ipsec.service # Some ISPs in Russia use l2tp without IPsec, so don't insist anymore #Wants=ipsec.service [Service] ExecStart=/usr/sbin/xl2tpd -D ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
