refresh patches

[openwrt/openwrt.git] / package / ppp / patches / 105-debian_demand.patch

diff --git a/package/ppp/patches/105-debian_demand.patch b/package/ppp/patches/105-debian_demand.patch
index be53c81b93f1fd441722ce6dcc30fec7349bb58f..d95a26ed63e1227a1883bc3c5144c80e8fc60c04 100644 (file)
--- a/package/ppp/patches/105-debian_demand.patch
+++ b/package/ppp/patches/105-debian_demand.patch
@@ -1,6 +1,5 @@
-diff -Naur ppp-2.4.4.orig/pppd/demand.c ppp-2.4.4/pppd/demand.c
---- ppp-2.4.4.orig/pppd/demand.c       2005-08-25 08:14:18.000000000 -0400
-+++ ppp-2.4.4/pppd/demand.c    2009-05-07 16:16:20.000000000 -0400
+--- a/pppd/demand.c
++++ b/pppd/demand.c

 @@ -36,6 +36,8 @@
  #include <errno.h>
  #include <fcntl.h>
 @@ -36,6 +36,8 @@
  #include <errno.h>
  #include <fcntl.h>


@@ -19,7 +18,7 @@ diff -Naur ppp-2.4.4.orig/pppd/demand.c ppp-2.4.4/pppd/demand.c
  #ifdef PPP_FILTER
  #include <pcap-bpf.h>
  #endif
  #ifdef PPP_FILTER
  #include <pcap-bpf.h>
  #endif

-@@ -221,6 +225,14 @@
+@@ -221,6 +225,14 @@ loop_chars(p, n)

      int c, rv;
  
      rv = 0;
      int c, rv;
  
      rv = 0;


@@ -34,7 +33,7 @@ diff -Naur ppp-2.4.4.orig/pppd/demand.c ppp-2.4.4/pppd/demand.c
      for (; n > 0; --n) {
        c = *p++;
        if (c == PPP_FLAG) {
      for (; n > 0; --n) {
        c = *p++;
        if (c == PPP_FLAG) {

-@@ -299,17 +311,102 @@
+@@ -299,17 +311,102 @@ loop_frame(frame, len)

   * loopback, now that the real serial link is up.
   */
  void
   * loopback, now that the real serial link is up.
   */
  void


@@ -138,10 +137,9 @@ diff -Naur ppp-2.4.4.orig/pppd/demand.c ppp-2.4.4/pppd/demand.c
            output(0, pkt->data, pkt->length);
            free(pkt);
        } else {
            output(0, pkt->data, pkt->length);
            free(pkt);
        } else {

-diff -Naur ppp-2.4.4.orig/pppd/ipcp.c ppp-2.4.4/pppd/ipcp.c
---- ppp-2.4.4.orig/pppd/ipcp.c 2009-05-07 15:49:34.000000000 -0400
-+++ ppp-2.4.4/pppd/ipcp.c      2009-05-07 16:16:20.000000000 -0400
-@@ -1776,7 +1776,7 @@
+--- a/pppd/ipcp.c
++++ b/pppd/ipcp.c
+@@ -1776,7 +1776,7 @@ ipcp_up(f)

                    proxy_arp_set[f->unit] = 1;
  
        }
                    proxy_arp_set[f->unit] = 1;
  
        }


@@ -150,10 +148,9 @@ diff -Naur ppp-2.4.4.orig/pppd/ipcp.c ppp-2.4.4/pppd/ipcp.c
        sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
  
      } else {
        sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
  
      } else {

-diff -Naur ppp-2.4.4.orig/pppd/ipv6cp.c ppp-2.4.4/pppd/ipv6cp.c
---- ppp-2.4.4.orig/pppd/ipv6cp.c       2005-08-25 19:59:34.000000000 -0400
-+++ ppp-2.4.4/pppd/ipv6cp.c    2009-05-07 16:16:20.000000000 -0400
-@@ -1232,7 +1232,7 @@
+--- a/pppd/ipv6cp.c
++++ b/pppd/ipv6cp.c
+@@ -1232,7 +1232,7 @@ ipv6cp_up(f)

            }
  
        }
            }
  
        }


@@ -162,10 +159,9 @@ diff -Naur ppp-2.4.4.orig/pppd/ipv6cp.c ppp-2.4.4/pppd/ipv6cp.c
        sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS);
  
      } else {
        sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS);
  
      } else {

-diff -Naur ppp-2.4.4.orig/pppd/pppd.h ppp-2.4.4/pppd/pppd.h
---- ppp-2.4.4.orig/pppd/pppd.h 2009-05-07 15:49:34.000000000 -0400
-+++ ppp-2.4.4/pppd/pppd.h      2009-05-07 16:16:20.000000000 -0400
-@@ -565,7 +565,7 @@
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -565,7 +565,7 @@ void demand_conf __P((void));      /* config 

  void demand_block __P((void));        /* set all NPs to queue up packets */
  void demand_unblock __P((void)); /* set all NPs to pass packets */
  void demand_discard __P((void)); /* set all NPs to discard packets */
  void demand_block __P((void));        /* set all NPs to queue up packets */
  void demand_unblock __P((void)); /* set all NPs to pass packets */
  void demand_discard __P((void)); /* set all NPs to discard packets */