From 624ed3e4126a0daf6bc7a8d8efc75f4315a3c628 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 16 Feb 2014 13:52:26 +0100
Subject: [PATCH] - updated to 2.4.6 - updated make patch - removed obsolete
 llc,llh patches - bugfix in static patch (use extern in header file) -
 actually enable PAM support

---
 ppp-llc.patch    | 10 ----------
 ppp-llh.patch    | 24 ------------------------
 ppp-make.patch   | 16 ++++------------
 ppp-static.patch |  2 +-
 ppp.spec         | 20 +++++++-------------
 5 files changed, 12 insertions(+), 60 deletions(-)
 delete mode 100644 ppp-llc.patch
 delete mode 100644 ppp-llh.patch

diff --git a/ppp-llc.patch b/ppp-llc.patch
deleted file mode 100644
index cae0370..0000000
--- a/ppp-llc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ppp-2.4.4/pppd/plugins/rp-pppoe/plugin.c~	2008-01-03 19:52:31.000000000 +0100
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/plugin.c	2008-01-03 19:53:20.997057881 +0100
-@@ -52,7 +49,6 @@
- #include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
--#include <linux/if_ppp.h>
- #include <linux/if_pppox.h>
- 
- #define _PATH_ETHOPT         _ROOT_PATH "/etc/ppp/options."
diff --git a/ppp-llh.patch b/ppp-llh.patch
deleted file mode 100644
index 91f9e81..0000000
--- a/ppp-llh.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ppp-2.4.5/pppd/sys-linux.c.orig	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/sys-linux.c	2010-08-22 09:02:24.710822457 +0200
-@@ -118,6 +118,9 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
-+#ifndef aligned_u64
-+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-+#endif
- #include <linux/ppp_defs.h>
- #include <linux/if_ppp.h>
- 
---- ppp-2.4.5/pppstats/pppstats.c.orig	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppstats/pppstats.c	2010-08-22 09:08:00.826816591 +0200
-@@ -72,6 +72,9 @@
- #include <linux/types.h>
- #include <linux/if.h>
- #endif
-+#ifndef aligned_u64
-+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-+#endif
- #include <linux/ppp_defs.h>
- #include <linux/if_ppp.h>
- #endif /* __linux__ */
diff --git a/ppp-make.patch b/ppp-make.patch
index 2503b1a..2758078 100644
--- a/ppp-make.patch
+++ b/ppp-make.patch
@@ -27,9 +27,8 @@ diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
  	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
  
  clean:
-diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4.make/pppd/Makefile.linux
---- ppp-2.4.4.orig/pppd/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4.make/pppd/Makefile.linux	2006-08-04 03:12:23.000000000 +0200
+--- ppp-2.4.6/pppd/Makefile.linux.orig	2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/Makefile.linux	2014-02-16 12:21:01.278474470 +0100
 @@ -32,7 +32,8 @@
  
  # CC = gcc
@@ -40,14 +39,7 @@ diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4.make/pppd/Makefile.linux
  LIBS =
  
  # Uncomment the next 2 lines to include support for Microsoft's
-@@ -62,13 +63,13 @@
- 
- HAS_SHADOW=y
- #USE_PAM=y
--#HAVE_INET6=y
-+HAVE_INET6=y
- 
- # Enable plugins
+@@ -68,7 +69,7 @@
  PLUGIN=y
  
  # Enable Microsoft proprietary Callback Control Protocol
@@ -56,7 +48,7 @@ diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4.make/pppd/Makefile.linux
  
  # Enable EAP SRP-SHA1 authentication (requires libsrp)
  #USE_SRP=y
-@@ -200,9 +201,7 @@
+@@ -208,9 +209,7 @@
  install: pppd
  	mkdir -p $(BINDIR) $(MANDIR)
  	$(EXTRAINSTALL)
diff --git a/ppp-static.patch b/ppp-static.patch
index e3612ba..04f9fa9 100644
--- a/ppp-static.patch
+++ b/ppp-static.patch
@@ -55,7 +55,7 @@
 +/* Added to allow static and dynamic ip(s).
 + * Holds the static ip from pap-secrets
 + */
-+u_int32_t staticaddr;
++extern u_int32_t staticaddr;
 +/******************************************/
 +
  extern struct protent ipcp_protent;
diff --git a/ppp.spec b/ppp.spec
index 8c8b661..cf038c1 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -14,15 +14,15 @@ Summary(pl.UTF-8):	Demon PPP dla Linuksa
 Summary(pt_BR.UTF-8):	Servidor ppp para Linux
 Summary(ru.UTF-8):	Демон ppp
 Summary(tr.UTF-8):	PPP sunucu süreci
-Summary(zh_CN.UTF-8):	PPP 配置和管理软件包.
+Summary(zh_CN.UTF-8):	PPP 配置和管理软件包
 Name:		ppp
-Version:	2.4.5
-Release:	7
+Version:	2.4.6
+Release:	1
 Epoch:		3
 License:	distributable
 Group:		Networking/Daemons
 Source0:	ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz
-# Source0-md5:	4621bc56167b6953ec4071043fe0ec57
+# Source0-md5:	3434d2cc9327167a0723aaaa8670083b
 Source1:	%{name}.pamd
 Source2:	%{name}.pon
 Source3:	%{name}.poff
@@ -41,14 +41,9 @@ Patch8:		%{name}-openssl.patch
 Patch9:		%{name}-lib64.patch
 #Patch10:	http://mppe-mppc.alphacron.de/%{name}-2.4.3-mppe-mppc-1.1.patch.gz
 Patch10:	%{name}-2.4.3-mppe-mppc-1.1.patch
-Patch11:	%{name}-llc.patch
-Patch12:	%{name}-llh.patch
-Patch13:	%{name}-ifpppstatsreq.patch 
-URL:		http://www.samba.org/ppp/
-BuildRequires:	autoconf
-BuildRequires:	automake
+Patch11:	%{name}-ifpppstatsreq.patch
+URL:		http://ppp.samba.org/
 BuildRequires:	libpcap-devel >= 2:0.8.1
-BuildRequires:	libtool
 %{?with_pppoatm:BuildRequires:	linux-atm-devel}
 # <linux/if_pppol2tp.h>
 BuildRequires:	linux-libc-headers >= 7:2.6.23
@@ -134,8 +129,6 @@ Wtyczka PPPoATM dla pppd.
 %endif
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 # use headers from llh instead of older supplied by ppp, incompatible with current llh
 %{__rm} include/linux/*.h
@@ -145,6 +138,7 @@ Wtyczka PPPoATM dla pppd.
 %configure
 %{__make} \
 	%{?with_pppoatm:HAVE_LIBATM=y} \
+	USE_PAM=y \
 	%{?with_srp:USE_SRP=y} \
 	OPT_FLAGS="%{rpmcflags} %{rpmcppflags}" \
 	COPTS="%{rpmcflags} %{rpmcppflags}" \
-- 
2.43.0