commit xl2tpd for openSUSE:Factory
Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2019-10-17 12:16:30 Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old) and /work/SRC/openSUSE:Factory/.xl2tpd.new.2352 (New) Package is "xl2tpd" Thu Oct 17 12:16:30 2019 rev:23 rq:738118 version:1.3.15 Changes: --- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes2019-04-21 09:02:05.410459195 +0200 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new.2352/xl2tpd.changes 2019-10-17 12:16:33.148035840 +0200 @@ -1,0 +2,7 @@ +Sun Oct 13 18:22:24 UTC 2019 - Martin Hauke + +- Update to version 1.3.15 + * Specify missing log arguments + * Sockopt bug fix for multiple IP's + +--- Old: v1.3.14.tar.gz New: v1.3.15.tar.gz Other differences: -- ++ xl2tpd.spec ++ --- /var/tmp/diff_new_pack.jSZybM/_old 2019-10-17 12:16:34.33703 +0200 +++ /var/tmp/diff_new_pack.jSZybM/_new 2019-10-17 12:16:34.33703 +0200 @@ -22,7 +22,7 @@ %define rundir /run %endif Name: xl2tpd -Version:1.3.14 +Version:1.3.15 Release:0 Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661) License:GPL-2.0-only ++ v1.3.14.tar.gz -> v1.3.15.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xl2tpd-1.3.14/.travis.yml new/xl2tpd-1.3.15/.travis.yml --- old/xl2tpd-1.3.14/.travis.yml 2019-04-17 18:23:39.0 +0200 +++ new/xl2tpd-1.3.15/.travis.yml 2019-10-13 20:06:03.0 +0200 @@ -1,9 +1,15 @@ -os: - - linux +matrix: + include: +- os: linux + dist: precise +- os: linux + dist: xenial + language: c compiler: - gcc + - clang sudo: false @@ -17,10 +23,10 @@ cache: directories: - - $HOME/.ccache +- $HOME/.ccache before_script: -make clean + make clean script: -make + make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xl2tpd-1.3.14/CHANGES new/xl2tpd-1.3.15/CHANGES --- old/xl2tpd-1.3.14/CHANGES 2019-04-17 18:23:39.0 +0200 +++ new/xl2tpd-1.3.15/CHANGES 2019-10-13 20:06:03.0 +0200 @@ -1,3 +1,13 @@ +v1.3.15 (October 13, 2019) +* Fix spacing of CONTRIBUTION.md [Samir Hussain] +* Add CONTRIBUTION.md [Samir Hussain] +* Specify missing log arguments [Patch by github user: 川島和津実] +* Use matrix for .travis.yaml to test for multiple Linux distro [Samir Hussain] +* Fixing .travis.yaml spacing warning [Samir Hussain] +* Sockopt bug fix for multiple IP's [JDTX] +* Add Clang as compiler test for travis [Samir Hussain] +* Add info on building and installing xl2tpd [Samir Hussain] + v1.3.14 (April 17, 2019) * osport.h: replace SUSv3-specific functions by POSIX variants [Fabrice Fontaine] * avp: Error Code field in Result Code AVP is optional [Pau Espin Pedrol] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xl2tpd-1.3.14/CONTRIBUTION.md new/xl2tpd-1.3.15/CONTRIBUTION.md --- old/xl2tpd-1.3.14/CONTRIBUTION.md 1970-01-01 01:00:00.0 +0100 +++ new/xl2tpd-1.3.15/CONTRIBUTION.md 2019-10-13 20:06:03.0 +0200 @@ -0,0 +1,44 @@ +# Contributing to xl2tpd + +First of, thank you for taking the time to contribute. + +*Before spending a lot of time on something, please ask for feedback on your +idea first!* You can ask in the [mailing list](https://lists.openswan.org/cgi-bin/mailman/listinfo/xl2tpd) +or create an [issue](https://github.com/xelerance/xl2tpd/issues). + +This project welcomes contribution from the community! Here are a few +suggestions: + +* Update the [ipv6 branch](https://github.com/xelerance/xl2tpd/tree/ipv6). + It needs to be tested and updated (it has diverged from master quite a bit). +* Test and fix up the [libevent branch](https://github.com/xelerance/xl2tpd/tree/libevent). + There have been reports of crashes. They need to be investigated. User can + get more information with the custom *--debug-signals* and + *--debug-libevent* option (which is only in this branch) + +## **Did you find a bug?** + +To report a security issue please send an e-mail to secur...@xelerance.com + +For non-security problems, ensure the bug was not already reported by +searching on GitHub under "[Issues](https://github.com/xelerance/xl2tpd/issues)" +and "[Pull requests](https://github.com/xelerance/xl2tpd/pulls)". + +When reporting an issue, please provide output and the content of the logs. + +## **Did you write a patch that fixes a bug?** + +* Open a new GitHub pull request with the patch. +* Ensure the PR description clearly describes the problem and solution. + Include the relevant issue number if
commit xl2tpd for openSUSE:Factory
Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2019-04-21 09:02:00 Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old) and /work/SRC/openSUSE:Factory/.xl2tpd.new.5536 (New) Package is "xl2tpd" Sun Apr 21 09:02:00 2019 rev:22 rq:695319 version:1.3.14 Changes: --- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes2019-03-22 14:55:31.950019205 +0100 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new.5536/xl2tpd.changes 2019-04-21 09:02:05.410459195 +0200 @@ -1,0 +2,6 @@ +Wed Apr 17 17:42:30 UTC 2019 - Martin Hauke + +- Update to version 1.3.14 + * Bugfix release, mostly code cleanup + +--- Old: v1.3.13.tar.gz New: v1.3.14.tar.gz Other differences: -- ++ xl2tpd.spec ++ --- /var/tmp/diff_new_pack.fBmXSL/_old 2019-04-21 09:02:07.950462212 +0200 +++ /var/tmp/diff_new_pack.fBmXSL/_new 2019-04-21 09:02:07.994462264 +0200 @@ -22,7 +22,7 @@ %define rundir /run %endif Name: xl2tpd -Version:1.3.13 +Version:1.3.14 Release:0 Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661) License:GPL-2.0-only ++ v1.3.13.tar.gz -> v1.3.14.tar.gz ++ 1688 lines of diff (skipped)
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2019-03-22 14:55:25
Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old)
and /work/SRC/openSUSE:Factory/.xl2tpd.new.25356 (New)
Package is "xl2tpd"
Fri Mar 22 14:55:25 2019 rev:21 rq:687038 version:1.3.13
Changes:
--- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes2017-11-09
13:58:00.010672327 +0100
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new.25356/xl2tpd.changes 2019-03-22
14:55:31.950019205 +0100
@@ -1,0 +2,31 @@
+Wed Mar 20 19:03:16 UTC 2019 - Jan Engelhardt
+
+- Drop ||true from %tmpfiles_create, this is already
+ included in the macro.
+- Reduce hard dependency on systemd during build.
+
+---
+Fri Mar 8 20:54:23 UTC 2019 - Martin Hauke
+
+- Run spec-cleaner
+- Remove support for non-systemd distros
+- Remove -doc subpackage (contained only some KB text-files and
+ and manpages)
+- Fix handling of tmpfilesdir
+- Update to version 1.3.13
+ * Fix compile warning with USE_KERNEL in xl2tpd.c
+ * Applying patch that reduces compile warnings and fixes warnings
+from gcc and clang.
+ * Fix compiler warnings in network.c
+ * Add a preproc for Watchguard firewall (Github issue #136)
+ * Convert from ISO-8859 to UTF-8 [Simon Deziel]
+Update README to provide latest info on xl2tpd + Linux kernel 4.15+
+- Update to version 1.3.12
+ * TOS value to copy to the tunnel header
+ * Fix for ENODEV (No such device) error with Linux kernel 4.15
+ * Update xl2tpd.init
+ * fix version number and upload
+- Update to version 1.3.11
+ * only changes related to debian packaging
+
+---
Old:
v1.3.10.tar.gz
New:
v1.3.13.tar.gz
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.FQJ6ES/_old 2019-03-22 14:55:33.870018079 +0100
+++ /var/tmp/diff_new_pack.FQJ6ES/_new 2019-03-22 14:55:33.874018076 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xl2tpd
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,43 +12,35 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if 0%{?suse_version} <= 1310
-%define rundir /var/run
+%define rundir %{_localstatedir}/run
%else
%define rundir /run
%endif
-
-Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661)
-License:GPL-2.0
-Group: Productivity/Networking/System
-
Name: xl2tpd
-Version:1.3.10
+Version:1.3.13
Release:0
-Url:http://www.xelerance.com/software/xl2tpd/
+Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661)
+License:GPL-2.0-only
+Group: Productivity/Networking/System
+URL:http://www.xelerance.com/software/xl2tpd/
Source0:https://github.com/xelerance/xl2tpd/archive/v%{version}.tar.gz
Source1:%{name}.service
Source2:%{name}.conf
Patch0: Makefile.patch
Patch1: xl2tpd.init.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: ppp
BuildRequires: libpcap
BuildRequires: libpcap-devel
-BuildRequires: linux-kernel-headers
-BuildRequires: linux-kernel-headers => 2.6.19
+BuildRequires: linux-kernel-headers >= 2.6.19
+BuildRequires: systemd-rpm-macros
+Requires: ppp
Obsoletes: l2tpd <= 0.68
Provides: l2tpd = 0.69
-
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd
-%{?systemd_requires}
-%define has_systemd 1
-%endif
+%{?systemd_ordering}
%description
xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661).
@@ -75,85 +67,63 @@
Xl2tpd is based on the 0.69 L2TP by Jeff McAdams
It was de-facto maintained by Jacco de Leeuw in 2002 and 2003.
-%package -n xl2tpd-doc
-Summary:Documentation for xl2tpd package
-Group: Documentation/Man
-
-%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 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
+make %{?_smp_mflags} DFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%install
-export PREFIX=/usr
-make DESTDIR=%{buildroot} MANDIR=%{buildroot}/%{_mandir} install
+export PREFIX=%{_prefix}
+%make_install
install -p -D
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2017-11-09 13:57:15
Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old)
and /work/SRC/openSUSE:Factory/.xl2tpd.new (New)
Package is "xl2tpd"
Thu Nov 9 13:57:15 2017 rev:20 rq:537044 version:1.3.10
Changes:
--- /work/SRC/openSUSE:Factory/xl2tpd/xl2tpd.changes2015-04-13
20:31:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2017-11-09
13:58:00.010672327 +0100
@@ -1,0 +2,29 @@
+Thu Oct 26 12:38:37 UTC 2017 - badshah...@gmail.com
+
+- Update to version 1.3.10
+ * Update STRLEN in file.h to 100 (from 80).
+ * xl2tpd-control: fix xl2tpd hanged up in "fopen".
+ * Update version in spec and opewnrt Makefile.
+- Update source URL in specfile.
+
+---
+Thu Jun 29 15:04:34 UTC 2017 - dims...@opensuse.org
+
+- Own /etc/ppp (mode 750, like other packages too).
+
+---
+Thu May 16 10:33:42 UTC 2017 - alexander_nau...@opensuse.org
+
+- Update to version 1.3.9
+ * Add xl2tpd-control man pages (Samir Hussain)
+ * Update spec file with newest Soure0 and version (Samir Hussain)
+ * Update License file (Samir Hussain)
+ * Display PID for call in the logs (Samir Hussain)
+ * Use left shift rather than pow() function. (Samir Hussain)
+ * Enable Travis integration (Samir Hussain)
+ * Remove unnecessary casting of malloc() results (Andrew Clayton)
+ * Remove an unused line of code in init_config() (Andrew Clayton)
+ * Fix some undefined behaviour in read_result() (Andrew Clayton)
+ * Fix feature test macro deprecation warnings (Andrew Clayton)
+
+---
Old:
v1.3.6.tar.gz
New:
v1.3.10.tar.gz
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.199tWJ/_old 2017-11-09 13:58:00.598650907 +0100
+++ /var/tmp/diff_new_pack.199tWJ/_new 2017-11-09 13:58:00.602650760 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xl2tpd
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
Group: Productivity/Networking/System
Name: xl2tpd
-Version:1.3.6
+Version:1.3.10
Release:0
Url:http://www.xelerance.com/software/xl2tpd/
Source0:https://github.com/xelerance/xl2tpd/archive/v%{version}.tar.gz
@@ -38,9 +38,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: ppp
BuildRequires: libpcap
-BuildRequires: linux-kernel-headers => 2.6.19
BuildRequires: libpcap-devel
BuildRequires: linux-kernel-headers
+BuildRequires: linux-kernel-headers => 2.6.19
Obsoletes: l2tpd <= 0.68
Provides: l2tpd = 0.69
@@ -95,6 +95,7 @@
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 -m750 %{buildroot}%{_sysconfdir}/ppp
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
@@ -159,6 +160,7 @@
%{_bindir}/pfc
%dir %{_sysconfdir}/xl2tpd
%config(noreplace) %{_sysconfdir}/xl2tpd/*
+%dir %{_sysconfdir}/ppp
%config(noreplace) %{_sysconfdir}/ppp/*
%ghost %{rundir}/xl2tpd
%if 0%{?has_systemd}
@@ -171,7 +173,7 @@
%files -n xl2tpd-doc
%defattr(-,root,root)
-%doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt
+%doc BUGS CHANGES CREDITS LICENSE README.* TODO
%doc doc/README.patents examples/chapsecrets.sample
%{_mandir}/*/*
++ v1.3.6.tar.gz -> v1.3.10.tar.gz ++
9587 lines of diff (skipped)
commit xl2tpd for openSUSE:Factory
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.changes2014-06-30
21:50:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2015-04-13
20:31:23.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.eRDwrL/_new 2015-04-13 20:31:24.0 +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
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2014-06-30 21:45:13
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.changes2014-01-07
14:38:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2014-06-30
21:45:39.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 26 15:27:11 UTC 2014 - dvla...@suse.com
+
+- switch to /run on openSUSE newer than 13.1
+
+---
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.vH0G0N/_old 2014-06-30 21:45:40.0 +0200
+++ /var/tmp/diff_new_pack.vH0G0N/_new 2014-06-30 21:45:40.0 +0200
@@ -16,6 +16,15 @@
#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%if 0%{?suse_version} = 1310
+%define rundir /var/run
+%else
+%define rundir /run
+%endif
+
Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661)
License:GPL-2.0
Group: Productivity/Networking/System
@@ -102,7 +111,7 @@
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
+install -p -D -m755 -d %{buildroot}%{rundir}/xl2tpd
%if 0%{?has_systemd}
install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
@@ -165,7 +174,7 @@
%config(noreplace) %{_sysconfdir}/xl2tpd/*
%config(noreplace) %{_sysconfdir}/ppp/*
%attr(0755,root,root) %{_initrddir}/xl2tpd
-%ghost %{_localstatedir}/run/xl2tpd
+%ghost %{rundir}/xl2tpd
%if 0%{?has_systemd}
/usr/lib/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xl2tpd for openSUSE:Factory
Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2014-01-07 14:38:25 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.changes2013-03-21 22:16:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2014-01-07 14:38:26.0 +0100 @@ -1,0 +2,5 @@ +Wed Jan 1 21:53:05 UTC 2014 - dvla...@suse.com + +- Remove newline from description in xl2tpd.conf (bnc#856928) + +--- Other differences: -- ++ xl2tpd.spec ++ --- /var/tmp/diff_new_pack.SsEnyT/_old 2014-01-07 14:38:27.0 +0100 +++ /var/tmp/diff_new_pack.SsEnyT/_new 2014-01-07 14:38:27.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package xl2tpd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++ xl2tpd.conf ++ --- /var/tmp/diff_new_pack.SsEnyT/_old 2014-01-07 14:38:27.0 +0100 +++ /var/tmp/diff_new_pack.SsEnyT/_new 2014-01-07 14:38:27.0 +0100 @@ -1,8 +1,6 @@ -# Create directory /var/run/xl2tpd with permission by default if it does not -exist yet. +# Create directory /var/run/xl2tpd with permission by default if it does not exist yet. d /var/run/xl2tpd 755 root root - - # Create a named pipe with the rights by default if it does not exist yet. p /var/run/xl2tpd/l2tp-control 600 root root - - -# Do not delete the directory /var/run/xl2tpd and its contents for cleaning -temporary files. +# Do not delete the directory /var/run/xl2tpd and its contents for cleaning temporary files. x /var/run/xl2tpd/ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2013-03-21 22:16:07
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.changes2012-12-03
11:51:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2013-03-21
22:16:08.0 +0100
@@ -1,0 +2,10 @@
+Sun Mar 17 16:14:54 UTC 2013 - dval...@suse.com
+
+- Use /usr/lib/tmpfile.d for tmpfiles configuration
+
+---
+Wed Mar 6 21:15:13 YEKT 2013 - avm.xan...@gmail.com
+
+- Added /etc/tmpfiles.d/xl2tpd.conf file (bnc#807605)
+
+---
New:
xl2tpd.conf
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.xO2Rjh/_old 2013-03-21 22:16:09.0 +0100
+++ /var/tmp/diff_new_pack.xO2Rjh/_new 2013-03-21 22:16:09.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xl2tpd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -26,6 +26,7 @@
Url:http://www.xelerance.com/software/xl2tpd/
Source0:%{name}-%{version}.tar.bz2
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+
@@ -105,6 +106,7 @@
%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
%endif
@@ -165,6 +167,7 @@
%attr(0755,root,root) %{_initrddir}/xl2tpd
%ghost %{_localstatedir}/run/xl2tpd
%if 0%{?has_systemd}
+/usr/lib/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
/usr/lib/modules-load.d/%{name}.conf
%endif
++ xl2tpd.conf ++
# Create directory /var/run/xl2tpd with permission by default if it does not
exist yet.
d /var/run/xl2tpd 755 root root - -
# Create a named pipe with the rights by default if it does not exist yet.
p /var/run/xl2tpd/l2tp-control 600 root root - -
# Do not delete the directory /var/run/xl2tpd and its contents for cleaning
temporary files.
x /var/run/xl2tpd/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xl2tpd for openSUSE:Factory
Hello community, here is the log from the commit of package xl2tpd for openSUSE:Factory checked in at 2012-12-03 11:51:27 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.changes2012-11-21 17:24:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2012-12-03 11:51:29.0 +0100 @@ -1,0 +2,5 @@ +Mon Nov 26 10:24:38 UTC 2012 - dval...@suse.com + +- don't use old version of if_pppol2tp.h (bnc#791109) + +--- Other differences: -- ++ xl2tpd.spec ++ --- /var/tmp/diff_new_pack.gYxwt9/_old 2012-12-03 11:51:30.0 +0100 +++ /var/tmp/diff_new_pack.gYxwt9/_new 2012-12-03 11:51:30.0 +0100 @@ -87,6 +87,8 @@ %patch0 %patch1 %patch2 -p1 +rm linux/include/linux/if_pppol2tp.h + %build make DFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2012-11-21 17:24:06
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.changes2012-09-03
18:56:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2012-11-21
17:24:07.0 +0100
@@ -1,0 +2,8 @@
+Wed Nov 21 06:04:50 UTC 2012 - bi...@opensuse.org
+
+- xl2tpd Add kernel support for 2.6.23+ (patch v12)
+ xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch
+ Public Clone URL: git://gist.github.com/1306094.git
+ (bnc#790250).
+
+---
New:
xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.X1Yw6d/_old 2012-11-21 17:24:08.0 +0100
+++ /var/tmp/diff_new_pack.X1Yw6d/_new 2012-11-21 17:24:08.0 +0100
@@ -28,6 +28,8 @@
Source1:%{name}.service
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
@@ -84,6 +86,7 @@
%patch0
%patch1
+%patch2 -p1
%build
make DFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS)
++ xl2tpd-1.3.0-0001-Add-kernel-support-for-2.6.32.patch ++
Index: xl2tpd-1.3.0/call.c
===
--- xl2tpd-1.3.0.orig/call.c
+++ xl2tpd-1.3.0/call.c
@@ -680,6 +680,8 @@ struct call *get_call (int tunnel, int c
st-peer.sin_port = port;
st-refme = refme;
st-refhim = refhim;
+st-udp_fd = -1;
+st-pppox_fd = -1;
bcopy (addr, st-peer.sin_addr, sizeof (addr));
st-next = tunnels.head;
tunnels.head = st;
Index: xl2tpd-1.3.0/control.c
===
--- xl2tpd-1.3.0.orig/control.c
+++ xl2tpd-1.3.0/control.c
@@ -596,6 +596,9 @@ int control_finish (struct tunnel *t, st
if (gconfig.debug_state)
l2tp_log (LOG_DEBUG, %s: sending SCCCN\n, __FUNCTION__);
control_xmit (buf);
+
+connect_pppol2tp(t);
+
/* Schedule a HELLO */
tv.tv_sec = HELLO_DELAY;
tv.tv_usec = 0;
@@ -608,6 +611,7 @@ int control_finish (struct tunnel *t, st
Connection established to %s, %d. Local: %d, Remote: %d
(ref=%u/%u).\n,
IPADDY (t-peer.sin_addr),
ntohs (t-peer.sin_port), t-ourtid, t-tid, t-refme,
t-refhim);
+
if (t-lac)
{
/* This is part of a LAC, so we want to go ahead
@@ -635,6 +639,9 @@ int control_finish (struct tunnel *t, st
IPADDY (t-peer.sin_addr),
ntohs (t-peer.sin_port), t-ourtid, t-tid, t-refme,
t-refhim,
t-lns-entname);
+
+connect_pppol2tp(t);
+
/* Schedule a HELLO */
tv.tv_sec = HELLO_DELAY;
tv.tv_usec = 0;
Index: xl2tpd-1.3.0/l2tp.h
===
--- xl2tpd-1.3.0.orig/l2tp.h
+++ xl2tpd-1.3.0/l2tp.h
@@ -167,6 +167,8 @@ struct tunnel
int ourrws; /* Receive Window Size */
int rxspeed; /* Receive bps */
int txspeed; /* Transmit bps */
+int udp_fd;/* UDP fd */
+int pppox_fd; /* PPPOX tunnel fd */
struct call *self;
struct lns *lns;/* LNS that owns us */
struct lac *lac;/* LAC that owns us */
@@ -220,6 +222,7 @@ extern void control_xmit (void *);
extern int ppd;
extern int switch_io; /* jz */
extern int control_fd;
+extern int connect_pppol2tp(struct tunnel *t);
extern int start_pppd (struct call *c, struct ppp_opts *);
extern void magic_lac_dial (void *);
extern int get_entropy (unsigned char *, int);
Index: xl2tpd-1.3.0/linux/include/linux/if_pppol2tp.h
===
--- xl2tpd-1.3.0.orig/linux/include/linux/if_pppol2tp.h
+++ xl2tpd-1.3.0/linux/include/linux/if_pppol2tp.h
@@ -36,6 +36,20 @@ struct pppol2tp_addr
__u16 d_tunnel, d_session; /* For sending outgoing packets */
};
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
commit xl2tpd for openSUSE:Factory
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.changes2011-11-21
15:50:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2012-09-03
18:56:54.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 31 21:45:57 UTC 2012 - crrodrig...@opensuse.org
+
+- Add systemd support.
+
+---
New:
xl2tpd.service
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.WtoGP0/_old 2012-09-03 18:56:56.0 +0200
+++ /var/tmp/diff_new_pack.WtoGP0/_new 2012-09-03 18:56:56.0 +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 jac...@dds.nl 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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail:
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2011-12-06 19:16:04
Comparing /work/SRC/openSUSE:Factory/xl2tpd (Old)
and /work/SRC/openSUSE:Factory/.xl2tpd.new (New)
Package is xl2tpd, Maintainer is
Changes:
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.X8baMz/_old 2011-12-06 19:56:38.0 +0100
+++ /var/tmp/diff_new_pack.X8baMz/_new 2011-12-06 19:56:38.0 +0100
@@ -21,7 +21,7 @@
Name: xl2tpd
Version:1.3.0
Release:1
-License:GPLv2
+License:GPL-2.0
Url:http://www.xelerance.com/software/xl2tpd/
Group: Productivity/Networking/System
Source0:%{name}-%{version}.tar.bz2
@@ -62,7 +62,7 @@
It was de-facto maintained by Jacco de Leeuw jac...@dds.nl in 2002 and 2003.
%package -n xl2tpd-doc
-License:GPLv2
+License:GPL-2.0
Summary:Documentation for xl2tpd package
Group: Documentation/Man
Version:1.3.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xl2tpd for openSUSE:Factory
Hello community,
here is the log from the commit of package xl2tpd for openSUSE:Factory checked
in at 2011-11-21 15:50: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.changes2011-09-23
12:51:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.xl2tpd.new/xl2tpd.changes 2011-11-21
15:50:57.0 +0100
@@ -1,0 +2,10 @@
+Thu Oct 26 20:10:00 UTC 2011 - nekola...@yandex.ru
+
+- update to xl2tpd 1.3.0
+ * added xl2tpd-control tool (activates/disconnects the tunnel,
+ actions with lac configuration file)
+ * fixed bug causing Resource temporarily unavailable(11) in log
+ * fixed xl2tpd hungs and won't redial after communication fail
+ * fixed buffer overrun in reading 16 char l2tp-secrets
+
+---
Old:
xl2tpd-1.2.4.tar.bz2
New:
xl2tpd-1.3.0.tar.bz2
Other differences:
--
++ xl2tpd.spec ++
--- /var/tmp/diff_new_pack.ANRYuL/_old 2011-11-21 15:50:59.0 +0100
+++ /var/tmp/diff_new_pack.ANRYuL/_new 2011-11-21 15:50:59.0 +0100
@@ -19,8 +19,8 @@
Summary:Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: xl2tpd
-Version:1.2.4
-Release:2
+Version:1.3.0
+Release:1
License:GPLv2
Url:http://www.xelerance.com/software/xl2tpd/
Group: Productivity/Networking/System
@@ -30,7 +30,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: ppp
%if %sles_version = 10
-BuildRequires: libpcap linux-kernel-headers = 2.6.23
+BuildRequires: libpcap linux-kernel-headers = 2.6.19
%endif
BuildRequires: libpcap-devel linux-kernel-headers
Obsoletes: l2tpd = 0.68
@@ -65,8 +65,8 @@
License:GPLv2
Summary:Documentation for xl2tpd package
Group: Documentation/Man
-Version:1.2.4
-Release:2
+Version:1.3.0
+Release:1
AutoReqProv:on
%description -n xl2tpd-doc
@@ -77,7 +77,6 @@
%patch0
%patch1
-
%build
make DFLAGS=$RPM_OPT_FLAGS
@@ -124,6 +123,7 @@
%defattr(-,root,root)
%{_sbindir}/rcxl2tpd
%{_sbindir}/xl2tpd
+%{_sbindir}/xl2tpd-control
%{_bindir}/pfc
%dir %{_sysconfdir}/xl2tpd
%config(noreplace) %{_sysconfdir}/xl2tpd/*
++ Makefile.patch ++
--- /var/tmp/diff_new_pack.ANRYuL/_old 2011-11-21 15:50:59.0 +0100
+++ /var/tmp/diff_new_pack.ANRYuL/_new 2011-11-21 15:50:59.0 +0100
@@ -1,5 +1,5 @@
Makefile.orig 2010-03-11 12:36:18.0 +0100
-+++ Makefile 2010-03-11 13:14:42.0 +0100
+--- ./Makefile.orig2011-07-24 04:13:59.0 +0400
./Makefile 2011-10-19 05:27:27.451967117 +0400
@@ -47,13 +47,13 @@
# trust pppd. This work around will be removed in the near future.
@@ -17,7 +17,7 @@
OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/
#
# Uncomment the following to use the kernel interface under Linux
-@@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include
+@@ -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
#
@@ -26,21 +26,12 @@
#
#
# Uncomment the next line for FreeBSD
-@@ -97,7 +97,7 @@ SRCS=${OBJS:.o=.c} ${HDRS}
- #LIBS= $(OSLIBS) # -lefence # efence for malloc checking
+@@ -99,7 +99,7 @@
EXEC=xl2tpd
+ CONTROL_EXEC=xl2tpd-control
-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-1.2.4.tar.bz2 - xl2tpd-1.3.0.tar.bz2 ++
2418 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
