- clone lib64 patch for libx32

diff --git a/ppp-libx32.patch b/ppp-libx32.patch
new file mode 100644 (file)
index 0000000..7487f83
--- /dev/null
+++ b/ppp-libx32.patch
@@ -0,0 +1,74 @@
+diff -urN ppp-2.4.4.org/pppd/pathnames.h ppp-2.4.4/pppd/pathnames.h
+--- ppp-2.4.4.org/pppd/pathnames.h     2005-08-26 01:59:34.000000000 +0200
++++ ppp-2.4.4/pppd/pathnames.h 2006-07-09 13:33:56.089093750 +0200
+@@ -57,9 +57,9 @@
+ 
+ #ifdef PLUGIN
+ #ifdef __STDC__
+-#define _PATH_PLUGIN  DESTDIR "/lib/pppd/" VERSION
++#define _PATH_PLUGIN  DESTDIR "/libx32/pppd/" VERSION
+ #else /* __STDC__ */
+-#define _PATH_PLUGIN  "/usr/lib/pppd"
++#define _PATH_PLUGIN  "/usr/libx32/pppd"
+ #endif /* __STDC__ */
+ 
+ #endif /* PLUGIN */
+diff -urN ppp-2.4.4.org/pppd/plugins/Makefile.linux ppp-2.4.4/pppd/plugins/Makefile.linux
+--- ppp-2.4.4.org/pppd/plugins/Makefile.linux  2006-07-09 13:32:56.401363000 +0200
++++ ppp-2.4.4/pppd/plugins/Makefile.linux      2006-07-09 13:33:28.519370750 +0200
+@@ -7,7 +7,7 @@
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/libx32/pppd/$(VERSION)
+ 
+ SUBDIRS := rp-pppoe pppoatm
+ # Uncomment the next line to include the radius authentication plugin
+diff -urN ppp-2.4.4.org/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux
+--- ppp-2.4.4.org/pppd/plugins/pppoatm/Makefile.linux  2004-11-14 02:12:10.000000000 +0100
++++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux      2006-07-09 13:33:28.523371000 +0200
+@@ -7,7 +7,7 @@
+ #***********************************************************************
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/libx32/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+diff -urN ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux ppp-2.4.4/pppd/plugins/radius/Makefile.linux
+--- ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux   2006-07-09 13:32:56.401363000 +0200
++++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux       2006-07-09 13:33:28.523371000 +0200
+@@ -5,7 +5,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/libx32/pppd/$(VERSION)
+ 
+ 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
+@@ -15,7 +15,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
++LIBDIR = $(DESTDIR)/libx32/pppd/$(PPPDVERSION)
+ 
+ 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 @@
+ #***********************************************************************
+ 
+ DESTDIR = @DESTDIR@
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/libx32/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 

diff --git a/ppp.spec b/ppp.spec
index f271371ee275538fd3055bc11726802cfcc3eef4..d27a973b2f2941acf405a177e9c8c622bd42cb34 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -42,6 +42,7 @@ 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}-ifpppstatsreq.patch
+Patch12:       %{name}-libx32.patch
 URL:           http://ppp.samba.org/
 BuildRequires: libpcap-devel >= 2:0.8.1
 %{?with_pppoatm:BuildRequires: linux-atm-devel}
@@ -129,6 +130,9 @@ Wtyczka PPPoATM dla pppd.
 %endif
 %patch10 -p1
 %patch11 -p1
+%if "%{_lib}" == "libx32"
+%patch12 -p1
+%endif
 
 # use headers from llh instead of older supplied by ppp, incompatible with current llh
 %{__rm} include/linux/*.h