refresh patches before applying upcoming fix

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13966 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/ipv6/send/patches/001-libnetfilter_queue_update.patch b/ipv6/send/patches/001-libnetfilter_queue_update.patch
index 8a2c808..124a52e 100644 (file)
--- a/ipv6/send/patches/001-libnetfilter_queue_update.patch
+++ b/ipv6/send/patches/001-libnetfilter_queue_update.patch
@@ -4,11 +4,9 @@
 # - use libnetfilter_queue instead of deprecated libipq
 #
 # Under GPLv2 - Copyright (C) 2008 - EADS - Arnaud Ebalard <arno@natisbad.org>
 # - use libnetfilter_queue instead of deprecated libipq
 #
 # Under GPLv2 - Copyright (C) 2008 - EADS - Arnaud Ebalard <arno@natisbad.org>

-Index: sendd-0.2/Makefile.config
-===================================================================
---- sendd-0.2.orig/Makefile.config     2008-05-27 16:53:49.238160776 +0200
-+++ sendd-0.2/Makefile.config  2008-05-27 16:53:52.866156255 +0200
-@@ -19,7 +19,7 @@
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -19,7 +19,7 @@ OS=linux

  #CC=gcc-4.0
  
  # Where to install
  #CC=gcc-4.0
  
  # Where to install


@@ -17,11 +15,9 @@ Index: sendd-0.2/Makefile.config
  
  # Set to "y" to build MT versions of sendd and cgatool
  USE_THREADS=n
  
  # Set to "y" to build MT versions of sendd and cgatool
  USE_THREADS=n

-Index: sendd-0.2/README
-===================================================================
---- sendd-0.2.orig/README      2008-05-27 16:53:49.246168775 +0200
-+++ sendd-0.2/README   2008-05-27 16:53:52.866156255 +0200
-@@ -20,7 +20,7 @@
+--- a/README
++++ b/README
+@@ -20,7 +20,7 @@ Linux:

    o CONFIG_NETFILTER, CONFIG_IPV6, CONFIG_IP6_NF_QUEUE, CONFIG_IP6_NF_IPTABLES,
      CONFIG_IP6_NF_FILTER enabled in your kernel config.
    o netfilter ip6tables command
    o CONFIG_NETFILTER, CONFIG_IPV6, CONFIG_IP6_NF_QUEUE, CONFIG_IP6_NF_IPTABLES,
      CONFIG_IP6_NF_FILTER enabled in your kernel config.
    o netfilter ip6tables command


@@ -30,11 +26,9 @@ Index: sendd-0.2/README
  
  FreeBSD:
    o NETGRAPH, NETGRAPH_BPF, NETGRAPH_ETHER, NETGRAPH_SOCKET enabled in
  
  FreeBSD:
    o NETGRAPH, NETGRAPH_BPF, NETGRAPH_ETHER, NETGRAPH_SOCKET enabled in

-Index: sendd-0.2/cgatool/Makefile
-===================================================================
---- sendd-0.2.orig/cgatool/Makefile    2008-05-27 16:53:49.278164104 +0200
-+++ sendd-0.2/cgatool/Makefile 2008-05-27 16:53:52.866156255 +0200
-@@ -25,7 +25,7 @@
+--- a/cgatool/Makefile
++++ b/cgatool/Makefile
+@@ -25,7 +25,7 @@ endif

  
  ifeq ($(USE_CONSOLE),y)
  ifeq ($(USE_READLINE),y)
  
  ifeq ($(USE_CONSOLE),y)
  ifeq ($(USE_READLINE),y)


@@ -43,11 +37,9 @@ Index: sendd-0.2/cgatool/Makefile
  endif
  endif
  
  endif
  endif
  

-Index: sendd-0.2/sendd/Makefile
-===================================================================
---- sendd-0.2.orig/sendd/Makefile      2008-05-27 16:53:49.286173430 +0200
-+++ sendd-0.2/sendd/Makefile   2008-05-27 16:53:52.878156241 +0200
-@@ -37,7 +37,7 @@
+--- a/sendd/Makefile
++++ b/sendd/Makefile
+@@ -37,7 +37,7 @@ endif

  
  ifeq ($(USE_CONSOLE),y)
  ifeq ($(USE_READLINE),y)
  
  ifeq ($(USE_CONSOLE),y)
  ifeq ($(USE_READLINE),y)


@@ -56,10 +48,8 @@ Index: sendd-0.2/sendd/Makefile
  endif
  endif
  
  endif
  endif
  

-Index: sendd-0.2/sendd/os-linux/Makefile
-===================================================================
---- sendd-0.2.orig/sendd/os-linux/Makefile     2008-05-27 16:53:49.294197424 +0200
-+++ sendd-0.2/sendd/os-linux/Makefile  2008-05-27 16:53:52.910156597 +0200
+--- a/sendd/os-linux/Makefile
++++ b/sendd/os-linux/Makefile

 @@ -1,23 +1,5 @@
  
  OBJS += os/addr.o os/ipq.o os/rand.o os/snd_linux.o
 @@ -1,23 +1,5 @@
  
  OBJS += os/addr.o os/ipq.o os/rand.o os/snd_linux.o


@@ -86,10 +76,8 @@ Index: sendd-0.2/sendd/os-linux/Makefile
 -# installed in include/libipq/libipq.h. This rule helps cpp to find it.
 -os/ipq.o: CPPFLAGS += -I/usr/include/libipq -I/usr/local/include/libipq
 +os/ipq.o: CPPFLAGS += -I/usr/include/libnetfilter_queue
 -# installed in include/libipq/libipq.h. This rule helps cpp to find it.
 -os/ipq.o: CPPFLAGS += -I/usr/include/libipq -I/usr/local/include/libipq
 +os/ipq.o: CPPFLAGS += -I/usr/include/libnetfilter_queue

-Index: sendd-0.2/sendd/os-linux/ipq.c
-===================================================================
---- sendd-0.2.orig/sendd/os-linux/ipq.c        2008-05-27 16:53:49.306181136 +0200
-+++ sendd-0.2/sendd/os-linux/ipq.c     2008-05-27 16:55:57.602168158 +0200
+--- a/sendd/os-linux/ipq.c
++++ b/sendd/os-linux/ipq.c

 @@ -33,7 +33,7 @@
  #include <sys/select.h>
  #include <netinet/in.h>
 @@ -33,7 +33,7 @@
  #include <sys/select.h>
  #include <netinet/in.h>


@@ -344,10 +332,8 @@ Index: sendd-0.2/sendd/os-linux/ipq.c
 +      if (h != NULL)
 +              nfq_close(h);
  }
 +      if (h != NULL)
 +              nfq_close(h);
  }

-Index: sendd-0.2/sendd/os-linux/snd_linux.c
-===================================================================
---- sendd-0.2.orig/sendd/os-linux/snd_linux.c  2008-05-27 16:53:49.314164060 +0200
-+++ sendd-0.2/sendd/os-linux/snd_linux.c       2008-05-27 16:53:52.914160667 +0200
+--- a/sendd/os-linux/snd_linux.c
++++ b/sendd/os-linux/snd_linux.c

 @@ -40,13 +40,13 @@
  void
  os_specific_add_fds(fd_set *fds, int *maxfd)
 @@ -40,13 +40,13 @@
  void
  os_specific_add_fds(fd_set *fds, int *maxfd)


@@ -364,7 +350,7 @@ Index: sendd-0.2/sendd/os-linux/snd_linux.c
  }
  
  int
  }
  
  int

-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ int

  os_specific_init(void)
  {
        if (linux_rand_init() < 0 ||
  os_specific_init(void)
  {
        if (linux_rand_init() < 0 ||


@@ -373,7 +359,7 @@ Index: sendd-0.2/sendd/os-linux/snd_linux.c
                return (-1);
        }
        return (0);
                return (-1);
        }
        return (0);

-@@ -68,6 +68,6 @@
+@@ -68,6 +68,6 @@ os_specific_init(void)

  void
  os_specific_fini(void)
  {
  void
  os_specific_fini(void)
  {


@@ -381,10 +367,8 @@ Index: sendd-0.2/sendd/os-linux/snd_linux.c
 +      linux_nfq_fini();
        linux_rand_fini();
  }
 +      linux_nfq_fini();
        linux_rand_fini();
  }

-Index: sendd-0.2/sendd/os-linux/snd_linux.h
-===================================================================
---- sendd-0.2.orig/sendd/os-linux/snd_linux.h  2008-05-27 16:53:49.330169232 +0200
-+++ sendd-0.2/sendd/os-linux/snd_linux.h       2008-05-27 16:53:52.914160667 +0200
+--- a/sendd/os-linux/snd_linux.h
++++ b/sendd/os-linux/snd_linux.h

 @@ -33,10 +33,10 @@
  #ifndef       _SEND_LINUX_H
  #define       _SEND_LINUX_H
 @@ -33,10 +33,10 @@
  #ifndef       _SEND_LINUX_H
  #define       _SEND_LINUX_H

diff --git a/ipv6/send/patches/002-handle_max_bits_conf.patch b/ipv6/send/patches/002-handle_max_bits_conf.patch
index ad45ea5..ab4008c 100644 (file)
--- a/ipv6/send/patches/002-handle_max_bits_conf.patch
+++ b/ipv6/send/patches/002-handle_max_bits_conf.patch
@@ -4,12 +4,9 @@ may optionnaly honor this setting (5.1.3). This is particularly
 useful on embedded systems where both the entropy and the processing
 power are limited.
 
 useful on embedded systems where both the entropy and the processing
 power are limited.
 

-Index: sendd-0.2/sendd/config.c
-===================================================================
-diff -urN sendd-0.2/sendd/config.c sendd-0.2.new/sendd/config.c
---- sendd-0.2/sendd/config.c   2008-04-18 16:21:46.000000000 +0200
-+++ sendd-0.2.new/sendd/config.c       2008-09-09 15:41:11.000000000 +0200
-@@ -82,6 +82,7 @@
+--- a/sendd/config.c
++++ b/sendd/config.c
+@@ -82,6 +82,7 @@ struct snd_conf snd_confs[] = {

        SND_CFS(snd_cga_params, NULL, 1),
        SND_CFIB(snd_full_secure, 1, 0),
        SND_CFII(snd_min_key_bits, 1024, "bits", 0),
        SND_CFS(snd_cga_params, NULL, 1),
        SND_CFIB(snd_full_secure, 1, 0),
        SND_CFII(snd_min_key_bits, 1024, "bits", 0),


@@ -17,12 +14,9 @@ diff -urN sendd-0.2/sendd/config.c sendd-0.2.new/sendd/config.c
        SND_CFII(snd_nonce_cache_gc_intvl, 2, "seconds", 0),
        SND_CFII(snd_pfx_cache_gc_intvl, 40, "seconds", 0),
        SND_CFS(snd_pkixip_conf, NULL, 0),
        SND_CFII(snd_nonce_cache_gc_intvl, 2, "seconds", 0),
        SND_CFII(snd_pfx_cache_gc_intvl, 40, "seconds", 0),
        SND_CFS(snd_pkixip_conf, NULL, 0),

-Index: sendd-0.2/sendd/sig_rfc3971.c
-===================================================================
-diff -urN sendd-0.2/sendd/sig_rfc3971.c sendd-0.2.new/sendd/sig_rfc3971.c
---- sendd-0.2/sendd/sig_rfc3971.c      2008-04-18 16:21:46.000000000 +0200
-+++ sendd-0.2.new/sendd/sig_rfc3971.c  2008-09-10 11:14:35.000000000 +0200
-@@ -147,7 +147,7 @@
+--- a/sendd/sig_rfc3971.c
++++ b/sendd/sig_rfc3971.c
+@@ -147,7 +147,7 @@ ver(struct iovec *iov, int iovlen, uint8

        EVP_MD_CTX ctx[1];
        EVP_PKEY *pub;
        int rv = -1;
        EVP_MD_CTX ctx[1];
        EVP_PKEY *pub;
        int rv = -1;


@@ -31,7 +25,7 @@ diff -urN sendd-0.2/sendd/sig_rfc3971.c sendd-0.2.new/sendd/sig_rfc3971.c
        DEFINE_TIMESTAMP_VARS();
  
        DBG_HEXDUMP(&dbg_cryptox, "key: ", key, klen);
        DEFINE_TIMESTAMP_VARS();
  
        DBG_HEXDUMP(&dbg_cryptox, "key: ", key, klen);

-@@ -164,6 +164,12 @@
+@@ -164,6 +164,12 @@ ver(struct iovec *iov, int iovlen, uint8

                    "minimum: %d)", EVP_PKEY_bits(pub), min_bits);
                return (-1);
        }
                    "minimum: %d)", EVP_PKEY_bits(pub), min_bits);
                return (-1);
        }


@@ -44,12 +38,9 @@ diff -urN sendd-0.2/sendd/sig_rfc3971.c sendd-0.2.new/sendd/sig_rfc3971.c
  
        real_slen = EVP_PKEY_size(pub);
        if (real_slen < slen) {
  
        real_slen = EVP_PKEY_size(pub);
        if (real_slen < slen) {

-Index: sendd-0.2/sendd/snd_config.h
-===================================================================
-diff -urN sendd-0.2/sendd/snd_config.h sendd-0.2.new/sendd/snd_config.h
---- sendd-0.2/sendd/snd_config.h       2008-04-18 16:21:46.000000000 +0200
-+++ sendd-0.2.new/sendd/snd_config.h   2008-09-09 15:09:45.000000000 +0200
-@@ -42,6 +42,7 @@
+--- a/sendd/snd_config.h
++++ b/sendd/snd_config.h
+@@ -42,6 +42,7 @@ enum snd_conf_syms {

        snd_cga_params,
        snd_full_secure,
        snd_min_key_bits,
        snd_cga_params,
        snd_full_secure,
        snd_min_key_bits,

diff --git a/ipv6/send/patches/003-keysig_8bytes_alignment.patch b/ipv6/send/patches/003-keysig_8bytes_alignment.patch
index 3ebc1a8..561cc3e 100644 (file)
--- a/ipv6/send/patches/003-keysig_8bytes_alignment.patch
+++ b/ipv6/send/patches/003-keysig_8bytes_alignment.patch
@@ -7,11 +7,9 @@ option to 8 bytes. Before that, send was padding with N bytes
 which would align to the number of bytes representing a pointer
 on your architecture.
 
 which would align to the number of bytes representing a pointer
 on your architecture.
 

-Index: sendd-0.2/sendd/snd_proto.h
-============================================================
---- sendd-0.2/sendd/snd_proto.h        2008-04-18 16:21:46.000000000 +0200
-+++ sendd-0.2.new/sendd/snd_proto.h    2008-10-05 16:08:34.000000000 +0200
-@@ -69,7 +69,7 @@
+--- a/sendd/snd_proto.h
++++ b/sendd/snd_proto.h
+@@ -69,7 +69,7 @@ struct snd_opt_sig {

        uint32_t                reserved;       /* opt hdr + reserved */
        uint8_t                 keyhash[SND_KEYHASH_LEN];
        uint8_t                 sig[0];
        uint32_t                reserved;       /* opt hdr + reserved */
        uint8_t                 keyhash[SND_KEYHASH_LEN];
        uint8_t                 sig[0];

diff --git a/ipv6/send/patches/004-always_link_with_ncurses.patch b/ipv6/send/patches/004-always_link_with_ncurses.patch
index 0bb9c68..367baae 100644 (file)
--- a/ipv6/send/patches/004-always_link_with_ncurses.patch
+++ b/ipv6/send/patches/004-always_link_with_ncurses.patch
@@ -2,11 +2,9 @@ We should always link with libncurses. This is not noticeable
 when building the debian packages because we install libncurses5
 runtime library as a dependency.
 
 when building the debian packages because we install libncurses5
 runtime library as a dependency.
 

-Index: sendd-0.2/cgatool/Makefile
-===================================================================
---- sendd-0.2/cgatool/Makefile 2008-10-05 16:26:28.000000000 +0200
-+++ sendd-0.2.new/cgatool/Makefile     2008-10-21 18:03:28.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/cgatool/Makefile
++++ b/cgatool/Makefile
+@@ -17,7 +17,7 @@ LDLIBS= $(DEPLIBS)

  LDFLAGS= -L../libs/.libs
  endif
  
  LDFLAGS= -L../libs/.libs
  endif
  


@@ -15,17 +13,14 @@ Index: sendd-0.2/cgatool/Makefile
  
  ifeq ($(USE_THREADS),y)
  LDLIBS += -lpthread
  
  ifeq ($(USE_THREADS),y)
  LDLIBS += -lpthread

-Index: sendd-0.2/sendd/Makefile
-===================================================================
-diff -urN sendd-0.2/sendd/Makefile sendd-0.2.new/sendd/Makefile
---- sendd-0.2/sendd/Makefile    2008-05-27 17:04:08.000000000 +0200
-+++ sendd-0.2.new/sendd/Makefile        2008-10-21 18:49:05.000000000 +0200
-@@ -28,7 +28,7 @@
+--- a/sendd/Makefile
++++ b/sendd/Makefile
+@@ -28,7 +28,7 @@ LDLIBS= $(DEPLIBS)

  LDFLAGS= -L../libs/.libs
  endif
  LDFLAGS= -L../libs/.libs
  endif

-
+ 

 -LDLIBS += -lcrypto
 +LDLIBS += -lcrypto -lncurses
  LDLIBS += $(OSLIBS)
 -LDLIBS += -lcrypto
 +LDLIBS += -lcrypto -lncurses
  LDLIBS += $(OSLIBS)

-
+ 

  ifeq ($(USE_THREADS),y)
  ifeq ($(USE_THREADS),y)