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@
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)
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
# 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
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>
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch9 -p1
%endif
%if %{with mppc}
-%patch10 -p1
+#%patch10 -p1
%endif
%patch11 -p1
%if "%{_lib}" == "libx32"
%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