Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2015-04-13 20:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old) and /work/SRC/openSUSE:Factory/.xl2tpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xl2tpd" Changes: -------- --- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes 2014-06-30 21:50:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2015-04-13 20:31:23.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Apr 12 00:55:33 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.3.6 + * Fix the size of the lenght param for AVP headers. This should + fix Android support no matter how the compiler optimizes. +- For changes from other versions, please read the CHANGES files +- Use download Url as source +- Remove redundant %clean section +- Remove xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch; + fixed by upstream +- Adapt Makefile.patch and xl2tpd.init.patch to upstream changes +- Do not provide sysvinit and systemd support on the same system; + it's redundant +- Add backward compatibility symlinl to systemd service + +------------------------------------------------------------------- Old: ---- xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch xl2tpd-1.3.0.tar.bz2 New: ---- v1.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xl2tpd.spec ++++++ --- /var/tmp/diff_new_pack.eRDwrL/_old 2015-04-13 20:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.eRDwrL/_new 2015-04-13 20:31:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xl2tpd # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,9 +16,6 @@ # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - %if 0%{?suse_version} <= 1310 %define rundir /var/run %else @@ -30,22 +27,18 @@ Group: Productivity/Networking/System Name: xl2tpd -Version: 1.3.0 +Version: 1.3.6 Release: 0 Url: http://www.xelerance.com/software/xl2tpd/ -Source0: %{name}-%{version}.tar.bz2 +Source0: https://github.com/xelerance/xl2tpd/archive/v%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf Patch0: Makefile.patch Patch1: xl2tpd.init.patch -# PATCH-FIX-UPSTREAM xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch bnc#790250 bi...@gnome.org -- xl2tpd Add kernel support for 2.6.23+ -Patch2: xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ppp -%if %sles_version >= 10 BuildRequires: libpcap BuildRequires: linux-kernel-headers => 2.6.19 -%endif BuildRequires: libpcap-devel BuildRequires: linux-kernel-headers Obsoletes: l2tpd <= 0.68 @@ -85,8 +78,6 @@ %package -n xl2tpd-doc Summary: Documentation for xl2tpd package Group: Documentation/Man -Version: 1.3.0 -Release: 0 %description -n xl2tpd-doc This package contains the documentation for using the xl2tpd daemon @@ -96,8 +87,6 @@ %patch0 %patch1 -%patch2 -p1 -rm linux/include/linux/if_pppol2tp.h %build make DFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS)" @@ -109,29 +98,24 @@ 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}%{rundir}/xl2tpd - %if 0%{?has_systemd} install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service install -D -m0644 %{S:2} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf mkdir -p %{buildroot}/usr/lib/modules-load.d echo "l2tp_ppp" > %{buildroot}/usr/lib/modules-load.d/%{name}.conf +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} +%else +install -p -D -m755 packaging/suse/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd +ln -sf /etc/init.d/xl2tpd $RPM_BUILD_ROOT/%{_sbindir}/rcxl2tpd %endif -%clean -rm -rf %{buildroot} - %pre - %if 0%{?has_systemd} %service_add_pre %{name}.service %endif %post -%{fillup_and_insserv xl2tpd} - # if we migrate from l2tpd to xl2tpd, copy the configs if [ -f /etc/l2tpd/l2tpd.conf ] then @@ -147,21 +131,24 @@ %if 0%{?has_systemd} %service_add_post %{name}.service +%fillup_only +%else +%{fillup_and_insserv xl2tpd} %endif %preun -%stop_on_removal xl2tpd - %if 0%{?has_systemd} %service_del_preun %{name}.service +%else +%stop_on_removal xl2tpd %endif %postun -%restart_on_update xl2tpd -%insserv_cleanup - %if 0%{?has_systemd} %service_del_postun %{name}.service +%else +%restart_on_update xl2tpd +%insserv_cleanup %endif %files @@ -173,13 +160,15 @@ %dir %{_sysconfdir}/xl2tpd %config(noreplace) %{_sysconfdir}/xl2tpd/* %config(noreplace) %{_sysconfdir}/ppp/* -%attr(0755,root,root) %{_initrddir}/xl2tpd %ghost %{rundir}/xl2tpd %if 0%{?has_systemd} /usr/lib/tmpfiles.d/%{name}.conf %{_unitdir}/%{name}.service /usr/lib/modules-load.d/%{name}.conf +%else +%attr(0755,root,root) %{_initrddir}/xl2tpd %endif + %files -n xl2tpd-doc %defattr(-,root,root) %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt ++++++ Makefile.patch ++++++ --- /var/tmp/diff_new_pack.eRDwrL/_old 2015-04-13 20:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.eRDwrL/_new 2015-04-13 20:31:24.000000000 +0200 @@ -17,15 +17,6 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ # # Uncomment the following to use the kernel interface under Linux -@@ -62,7 +62,7 @@ - # 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 @@ -99,7 +99,7 @@ EXEC=xl2tpd CONTROL_EXEC=xl2tpd-control ++++++ xl2tpd.init.patch ++++++ --- /var/tmp/diff_new_pack.eRDwrL/_old 2015-04-13 20:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.eRDwrL/_new 2015-04-13 20:31:24.000000000 +0200 @@ -4,8 +4,8 @@ # ### BEGIN INIT INFO # Provides: xl2tpd --# Required-Start: $syslog --# Required-Stop: $syslog +-# Required-Start: $syslog $remote_fs +-# Required-Stop: $syslog $remote_fs +# Required-Start: $remote_fs $syslog $network +# Required-Stop: $remote_fs $syslog $network +# Should-Start: ypbind
