- dropped static patch, did nothing useful (seems incomplete from the beginning)

diff --git a/ppp-static.patch b/ppp-static.patch
deleted file mode 100644 (file)
index dd69cfe..0000000
--- a/ppp-static.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- ppp-2.3.7/pppd/ipcp.c      Fri Mar 19 05:22:51 1999
-+++ ppp-2.3.7.new/pppd/ipcp.c  Wed Apr 28 20:24:32 1999
-@@ -218,6 +218,13 @@
- static pid_t ipcp_script_pid;
- 
- /*
-+ * Added to allow static and dynamic ip(s)
-+ * Hold the static address from pap-secrets
-+ */
-+u_int32_t staticaddr;
-+/******************************************/
-+
-+/*
-  * Make a string representation of a network IP address.
-  */
- char *
-@@ -1055,6 +1062,15 @@
-               orc = CONFNAK;
-               if (!reject_if_disagree) {
-                   DECPTR(sizeof(u_int32_t), p);
-+
-+          /*
-+           * Added to allow static and dynamic ip(s)
-+           * Are they asking for their static ip from pap-secrets?
-+           */
-+          if(ciaddr1 !=0 && ciaddr1 == staticaddr)
-+             wo->hisaddr = staticaddr;     /* Let them use the static ip */
-+          /*******************************************/
-+      
-                   tl = ntohl(wo->hisaddr);
-                   PUTLONG(tl, p);
-               }
-@@ -1078,6 +1094,15 @@
-                   orc = CONFNAK;
-                   if (!reject_if_disagree) {
-                       DECPTR(sizeof(u_int32_t), p);
-+
-+          /*
-+           * Added to allow static and dynamic ip(s)
-+           * Are they asking for their static ip from pap-secrets?
-+           */
-+          if(ciaddr1 !=0 && ciaddr1 == staticaddr)
-+             wo->hisaddr = staticaddr;     /* Let them use the static ip */
-+          /*******************************************/
-+
-                       tl = ntohl(wo->ouraddr);
-                       PUTLONG(tl, p);
-                   }
---- ppp-2.3.7/pppd/ipcp.h      Tue Mar  2 06:34:34 1999
-+++ ppp-2.3.7.new/pppd/ipcp.h  Wed Apr 28 20:27:15 1999
-@@ -70,4 +70,10 @@
- 
- char *ip_ntoa(u_int32_t);
- 
-+/* Added to allow static and dynamic ip(s).
-+ * Holds the static ip from pap-secrets
-+ */
-+extern u_int32_t staticaddr;
-+/******************************************/
-+
- extern struct protent ipcp_protent;

diff --git a/ppp.spec b/ppp.spec
index 6ab197f19515e3240c7be2c4b5e3a4f6652fddde..32d85e696ab777815a96391cacffc40f0c7075d2 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -32,7 +32,6 @@ Source4:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Source5:       %{name}.logrotate
 Patch0:                %{name}-make.patch
 Patch2:                %{name}-debian_scripts.patch
-Patch3:                %{name}-static.patch
 Patch4:                %{name}-pidfile-owner.patch
 #Patch7:               http://public.planetmirror.com/pub/mppe/pppd-2.4.2-chapms-strip-domain.patch.gz
 Patch7:                pppd-2.4.2-chapms-strip-domain.patch
@@ -118,7 +117,6 @@ Wtyczka PPPoATM dla pppd.
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch7 -p1
 %patch8 -p1