- bcond_off_pppoe (PPPoE requires kernel 2.4)

Changed files:
    ppp-opt-pppoe.patch -> 1.1
    ppp-opt.patch -> 1.2
    ppp.spec -> 1.50

diff --git a/ppp-opt-pppoe.patch b/ppp-opt-pppoe.patch
new file mode 100644 (file)
index 0000000..fc0e874
--- /dev/null
+++ b/ppp-opt-pppoe.patch
@@ -0,0 +1,31 @@
+--- ppp-2.4.0/pppd/plugins/Makefile.linux~     Sun Jan 14 17:44:33 2001
++++ ppp-2.4.0/pppd/plugins/Makefile.linux      Sun Jan 14 17:47:04 2001
+@@ -1,5 +1,5 @@
+ CC    = gcc
+-CFLAGS        = -g -O2 -I.. -I../../include -D_linux_=1 -fPIC
++CFLAGS        += -I.. -I../../include -D_linux_=1 -fPIC
+ LDFLAGS       = -shared
+ 
+ all:  minconn.so passprompt.so
+--- ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux~       Sun Jan 14 17:44:33 2001
++++ ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux        Sun Jan 14 17:47:29 2001
+@@ -1,5 +1,5 @@
+ CC    = gcc
+-CFLAGS        = -g  -I.. -I../.. -I../../../include -D_linux_=1 -fPIC
++CFLAGS        += -I.. -I../.. -I../../../include -D_linux_=1 -fPIC
+ LDFLAGS       = -shared
+ 
+ all: pppoe.so pppoed
+@@ -35,10 +35,10 @@
+ clean: 
+       rm -f *.o *.so *.a pppoefwd pppoed
+ 
+-INSTALL= install -o root
++INSTALL= install
+ 
+ install: $(PLUGINDIR) all
+-      $(INSTALL) -s -c -m 4550 pppoe.so $(PLUGINDIR)
++      $(INSTALL) -s -c pppoe.so $(PLUGINDIR)
+ 
+ 
+ $(PLUGINDIR):

diff --git a/ppp-opt.patch b/ppp-opt.patch
index fc0e874e9e1b48b81013a85271117023cb930a77..180ad0116691952aac1a41f29fda893d20862d23 100644 (file)
--- a/ppp-opt.patch
+++ b/ppp-opt.patch
@@ -2,30 +2,8 @@
 +++ ppp-2.4.0/pppd/plugins/Makefile.linux      Sun Jan 14 17:47:04 2001
 @@ -1,5 +1,5 @@
  CC    = gcc
--CFLAGS        = -g -O2 -I.. -I../../include -D_linux_=1 -fPIC
-+CFLAGS        += -I.. -I../../include -D_linux_=1 -fPIC
+-CFLAGS        = -g -O2 -I.. -I../../include
++CFLAGS        += -I.. -I../../include
  LDFLAGS       = -shared
  
  all:  minconn.so passprompt.so
---- ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux~       Sun Jan 14 17:44:33 2001
-+++ ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux        Sun Jan 14 17:47:29 2001
-@@ -1,5 +1,5 @@
- CC    = gcc
--CFLAGS        = -g  -I.. -I../.. -I../../../include -D_linux_=1 -fPIC
-+CFLAGS        += -I.. -I../.. -I../../../include -D_linux_=1 -fPIC
- LDFLAGS       = -shared
- 
- all: pppoe.so pppoed
-@@ -35,10 +35,10 @@
- clean: 
-       rm -f *.o *.so *.a pppoefwd pppoed
- 
--INSTALL= install -o root
-+INSTALL= install
- 
- install: $(PLUGINDIR) all
--      $(INSTALL) -s -c -m 4550 pppoe.so $(PLUGINDIR)
-+      $(INSTALL) -s -c pppoe.so $(PLUGINDIR)
- 
- 
- $(PLUGINDIR):

diff --git a/ppp.spec b/ppp.spec
index 747eb460c2222cca4d0df520d2a1e0f6ae6df463..37787597034c5e6b322e1da24fd8f3afd350efc6 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,3 +1,5 @@
+#
+# bcond_off_pppoe - without PPPoE support (which requires kernel 2.4)
 Summary:       ppp daemon package for linux 2.2.11 and greater
 Summary(de):   ppp-Dämonpaket für Linux 2.2.11 und höher 
 Summary(fr):   Paquetage du démon ppp pour Linux 2.2.11 et supérieur
@@ -23,8 +25,9 @@ Patch4:               %{name}-CBCP.patch
 Patch5:                %{name}-speed.patch
 Patch6:                %{name}-pam_session.patch
 Patch7:                %{name}-wtmp.patch
-Patch8:                http://www.math.uwaterloo.ca/~mostrows/ppp-2.4.0-pppoe.patch2
-Patch9:                %{name}-opt.patch
+Patch8:                %{name}-opt.patch
+Patch9:                http://www.math.uwaterloo.ca/~mostrows/ppp-2.4.0-pppoe.patch2
+Patch10:       %{name}-opt-pppoe.patch
 # Patch 10 was built out of the following:
 #http://www.math.uwaterloo.ca/~mostrows/pppd.patch.240600
 #http://www.sfgoth.com/~mitch/linux/atm/pppoatm/pppoatm-pppd-vs-2.4.0b2+240600.diff.gz
@@ -70,9 +73,9 @@ Hat 
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
+%{?bcond_off_pppoe:%patch8 -p1}
+%{!?bcond_off_pppoe:%patch9 -p1}
+%{!?bcond_off_pppoe:%patch10 -p1}
 %build
 %configure
 %{__make} OPT_FLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
@@ -115,9 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/chat
 %attr(755,root,root) %{_sbindir}/pppstats
 %attr(755,root,root) %{_sbindir}/pppd
-%dir %{_libdir}/pppd
-%dir %{_libdir}/pppd/plugins
-%attr(755,root,root) %{_libdir}/pppd/plugins/*
+%{!?bcond_off_pppoe:%dir %{_libdir}/pppd}
+%{!?bcond_off_pppoe:%dir %{_libdir}/pppd/plugins}
+%{!?bcond_off_pppoe:%attr(755,root,root) %{_libdir}/pppd/plugins/*}
 %{_mandir}/man8/*
 
 %attr(600,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/ppp/*-secrets