commit d7b255327c86b115f4fe266113fa7d0727e14db1
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jan 6 12:39:27 2021 +0200
Up to 2.4.9
- Updated ppp-lib64.patch, ppp-rp-pppoe-macaddr.patch patches
- Dropped ppp-expect.patch (no longer relevant)
- Needs updating/dropping: -make.patch, -2.4.3-mppe-mppc-1.1.patch
rp-pppoe.so is now symlink to pppoe.so
refs:
- https://github.com/paulusmack/ppp/issues/111
ppp-expect.patch | 8 --------
ppp-lib64.patch | 15 +++++++--------
ppp-rp-pppoe-macaddr.patch | 5 ++---
ppp.spec | 21 ++++++++++-----------
4 files changed, 19 insertions(+), 30 deletions(-)
---
diff --git a/ppp.spec b/ppp.spec
index 140ee24..ccc65a9 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -17,13 +17,13 @@ Summary(ru.UTF-8): Демон ppp
Summary(tr.UTF-8): PPP sunucu süreci
Summary(zh_CN.UTF-8): PPP 配置和管理软件包
Name: ppp
-Version: 2.4.8
-Release: 1
+Version: 2.4.9
+Release: 0.1
Epoch: 3
License: distributable
Group: Networking/Daemons
-Source0: https://www.samba.org/ftp/ppp/%{name}-%{version}.tar.gz
-# Source0-md5: 2ca8342b9804be15103fd3f687af701c
+Source0: https://download.samba.org/pub/ppp/%{name}-%{version}.tar.gz
+# Source0-md5: c88153ae3d16ae114152cd3c15c7301d
Source1: %{name}.pamd
Source2: %{name}.pon
Source3: %{name}.poff
@@ -31,7 +31,6 @@ Source4:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
# Source4-md5: 3801b59005bef8f52856300fe3167a64
Source5: %{name}.logrotate
Patch0: %{name}-make.patch
-Patch1: %{name}-expect.patch
Patch2: %{name}-debian_scripts.patch
Patch3: %{name}-static.patch
Patch4: %{name}-pidfile-owner.patch
@@ -44,7 +43,7 @@ Patch9: %{name}-lib64.patch
Patch10: %{name}-2.4.3-mppe-mppc-1.1.patch
Patch11: %{name}-ifpppstatsreq.patch
Patch12: %{name}-libx32.patch
-URL: http://ppp.samba.org/
+URL: https://ppp.samba.org/
BuildRequires: libpcap-devel >= 2:0.8.1
%{?with_pppoatm:BuildRequires: linux-atm-devel}
# <linux/if_pppol2tp.h>
@@ -118,8 +117,7 @@ Wtyczka PPPoATM dla pppd.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -130,7 +128,7 @@ Wtyczka PPPoATM dla pppd.
%patch9 -p1
%endif
%if %{with mppc}
-%patch10 -p1
+#%patch10 -p1
%endif
%patch11 -p1
%if "%{_lib}" == "libx32"
@@ -217,13 +215,14 @@ fi
%dir %{_libdir}/pppd/plugins
%attr(755,root,root) %{_libdir}/pppd/plugins/minconn.so
%attr(755,root,root) %{_libdir}/pppd/plugins/openl2tp.so
-%attr(755,root,root) %{_libdir}/pppd/plugins/pppol2tp.so
%attr(755,root,root) %{_libdir}/pppd/plugins/passprompt.so
%attr(755,root,root) %{_libdir}/pppd/plugins/passwordfd.so
-%attr(755,root,root) %{_libdir}/pppd/plugins/rp-pppoe.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppoe.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppol2tp.so
%attr(755,root,root) %{_libdir}/pppd/plugins/radattr.so
%attr(755,root,root) %{_libdir}/pppd/plugins/radius.so
%attr(755,root,root) %{_libdir}/pppd/plugins/radrealms.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/rp-pppoe.so
%attr(755,root,root) %{_libdir}/pppd/plugins/winbind.so
# TODO: legacy, try to drop
diff --git a/ppp-expect.patch b/ppp-expect.patch
deleted file mode 100644
index 40dca60..0000000
--- a/ppp-expect.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ppp-2.3.7/scripts/secure-card Tue Oct 3 07:31:20 1995
-+++ ppp-2.3.7.new/scripts/secure-card Wed Apr 28 17:11:19 1999
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/expect -f
-+#!/usr/bin/expect -f
- #
- # This script was written by Jim Isaacson <[email protected]>. It is
- # designed to work as a script to use the SecureCARD(tm) device. This
diff --git a/ppp-lib64.patch b/ppp-lib64.patch
index bf21d49..49475ae 100644
--- a/ppp-lib64.patch
+++ b/ppp-lib64.patch
@@ -49,9 +49,8 @@ diff -urN ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux
ppp-2.4.4/pppd/plugin
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-diff -urN ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux
ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux 2006-07-09
13:32:56.401363000 +0200
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2006-07-09
13:33:28.523371000 +0200
+--- ppp-2.4.4.org/pppd/plugins/pppoe/Makefile.linux 2006-07-09
13:32:56.401363000 +0200
++++ ppp-2.4.4/pppd/plugins/pppoe/Makefile.linux 2006-07-09
13:33:28.523371000 +0200
@@ -15,7 +15,7 @@
DESTDIR = $(INSTROOT)@DESTDIR@
@@ -61,12 +60,12 @@ diff -urN
ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4/pppd/plug
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }'
../../patchlevel.h)
---- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux~ 2010-05-23
20:09:01.894181407 +0200
-+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2010-05-23
20:10:05.074174654 +0200
-@@ -7,7 +7,7 @@
- #***********************************************************************
+--- ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux~ 2021-01-05
01:06:37.000000000 +0200
++++ ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux 2021-01-06
12:47:44.418302301 +0200
+@@ -4,7 +4,7 @@
+ COPTS=@CFLAGS@
- DESTDIR = @DESTDIR@
+ DESTDIR = $(INSTROOT)/@DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
diff --git a/ppp-rp-pppoe-macaddr.patch b/ppp-rp-pppoe-macaddr.patch
index 8a391fd..84ceade 100644
--- a/ppp-rp-pppoe-macaddr.patch
+++ b/ppp-rp-pppoe-macaddr.patch
@@ -1,6 +1,5 @@
-diff -urN ppp-2.4.2-20020901.org/pppd/plugins/rp-pppoe/plugin.c
ppp-2.4.2-20020901/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.2-20020901.org/pppd/plugins/rp-pppoe/plugin.c Tue Sep 3
22:16:35 2002
-+++ ppp-2.4.2-20020901/pppd/plugins/rp-pppoe/plugin.c Tue Sep 3 22:17:41 2002
+--- ppp-2.4.2-20020901.org/pppd/plugins/pppoe/plugin.c Tue Sep 3 22:16:35 2002
++++ ppp-2.4.2-20020901/pppd/plugins/pppoe/plugin.c Tue Sep 3 22:17:41 2002
@@ -174,6 +174,8 @@
(unsigned) conn->peerEth[4],
(unsigned) conn->peerEth[5]);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ppp.git/commitdiff/d7b255327c86b115f4fe266113fa7d0727e14db1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
