Changeset b917538 in freewrt


Ignore:
Timestamp:
Oct 1, 2006, 10:31:51 AM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
edaeca5
Parents:
2f09cbe
Message:
  • sync with changes in trunk
  • lzo2 instead of lzo
  • fix tinc/vtun build
  • security update for openssh/openssl
  • update for iproute2,openvpn,openntpd, iptables and ipp, openswan
  • disable ipv6 in busybox, autoselect this feature for all ipv6 related packages
  • add better startup scripts for openssh and openntpd

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@800 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
4 added
2 deleted
30 edited
2 moved

Legend:

Unmodified
Added
Removed

  • mk/pkg-depend.mk

    r2f09cbe rb917538  
    2222digitemp-compile: libusb-compile
    2323dsniff-compile: libnids-compile openssl-compile libgdbm-compile
     24elinks-compile: openssl-compile
    2425fprobe-compile: libpcap-compile
    2526freetype-compile: zlib-compile
    … …  
    6465mutt-compile: ncurses-compile openssl-compile
    6566mysql-compile: ncurses-compile zlib-compile readline-compile
     67mrd6-compile: uclibc++-compile
    6668nano-compile: ncurses-compile
    6769net-snmp-compile: libelf-compile

  • package/6tunnel/Config.in

    r2f09cbe rb917538  
    44        default n
    55        select FWRT_PACKAGE_KMOD_IPV6
     6        select BUSYBOX_CONFIG_FEATURE_IPV6
    67        help
    78          6tunnel allows you to use services provided by IPv6 hosts with IPv4-only

  • package/aiccu/Config.in

    r2f09cbe rb917538  
    55        select FWRT_PACKAGE_KMOD_IPV6
    66        select FWRT_PACKAGE_LIBPTHREAD
     7        select BUSYBOX_CONFIG_FEATURE_IPV6
    78        help
    89          SixXS Automatic IPv6 Connectivity Client Utility

  • package/busybox/config/networking/Config.in

    r2f09cbe rb917538  
    88config BUSYBOX_CONFIG_FEATURE_IPV6
    99        bool "Enable IPv6 support"
    10         default y
     10        default n
    1111        help
    1212          Enable IPv6 support to busybox. This makes applets that talk IP
    … …  
    2323        default n
    2424        help
    25           Small and static DNS server deamon.
     25          Small and static DNS server daemon.
    2626
    2727config BUSYBOX_CONFIG_ETHER_WAKE

  • package/dhcp6/Config.in

    r2f09cbe rb917538  
    22        prompt "dhcp6............................. IPv6 DHCP server and client"
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default n
    55        select FWRT_PACKAGE_LIBNCURSES
     6        select BUSYBOX_CONFIG_FEATURE_IPV6
    67        help
    7                 This is the first ever open source implementation of Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server and client on Linux Operating System. The server provides leases (durations or lifetimes) on IPv6 addresses to the clients who request for it
     8                This is the first ever open source implementation of Dynamic
     9                Host Configuration Protocol for IPv6 (DHCPv6) server and client
     10                on Linux Operating System. The server provides leases
     11                (durations or lifetimes) on IPv6 addresses to the clients who
     12                request for it

  • package/dropbear/files/dropbear.init

    r2f09cbe rb917538  
    66autostart)
    77        test x"$ssh" = x"NO" && exit 0
     8        [ -x /usr/sbin/sshd ] -o [ x"$openssh" = x"YES" ] && exit 0
    89        exec $0 start
    910        ;;

  • package/iproute2/Config.in

    r2f09cbe rb917538  
    1515        default n
    1616        select FWRT_COMPILE_IPROUTE2
     17        select FWRT_PACKAGE_KMOD_IMQ
    1718        select FWRT_PACKAGE_KMOD_SCHED

  • package/iproute2/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              iproute2
    10 PKG_VERSION:=           2.6.15-060110
     10PKG_VERSION:=           2.6.16-060323
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            04f57a6d366d36426d276178b600f5c5
     12PKG_MD5SUM:=            f31d4516b35bbfeaa72c762f5959e97c
    1313
    1414PKG_SOURCE_URL:=        http://developer.osdl.org/dev/iproute2/download/
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
    16 
    17 WRKSRC=                 ${WRKDIR}/iproute2-$(PKG_VERSION)
    1815
    1916include $(TOPDIR)/mk/package.mk

  • package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch

    r2f09cbe rb917538  
    1 diff -Nur iproute2-2.6.11-050330/ip/ipxfrm.c iproute2-2.6.11-050330.new/ip/ipxfrm.c
    2 --- iproute2-2.6.11-050330/ip/ipxfrm.c  2005-04-01 21:58:11.000000000 +0200
    3 +++ iproute2-2.6.11-050330.new/ip/ipxfrm.c      2005-05-27 12:27:44.000000000 +0200
    4 @@ -444,7 +444,6 @@
     1diff -Nur iproute2-2.6.16-060323/ip/ipxfrm.c iproute2-2.6.16-060323.no_sctp/ip/ipxfrm.c
     2--- iproute2-2.6.16-060323/ip/ipxfrm.c  2006-01-12 19:31:36.000000000 +0100
     3+++ iproute2-2.6.16-060323.no_sctp/ip/ipxfrm.c  2006-09-29 14:24:04.000000000 +0200
     4@@ -444,8 +444,6 @@
    55        switch (sel->proto) {
    66        case IPPROTO_TCP:
    77        case IPPROTO_UDP:
    88-       case IPPROTO_SCTP:
     9-       case IPPROTO_DCCP:
    910        default: /* XXX */
    1011                if (sel->sport_mask)
    1112                        fprintf(fp, "sport %u ", ntohs(sel->sport));
    12 @@ -998,7 +997,6 @@
     13@@ -999,8 +997,6 @@
    1314                switch (sel->proto) {
    1415                case IPPROTO_TCP:
    1516                case IPPROTO_UDP:
    1617-               case IPPROTO_SCTP:
     18-               case IPPROTO_DCCP:
    1719                        break;
    1820                default:

  • package/iptables/Config.in

    r2f09cbe rb917538  
    1111        default n
    1212        select FWRT_COMPILE_IPTABLES
     13        select FWRT_PACKAGE_KMOD_IPTABLES
    1314        help
    1415          IPv4 firewall, NAT, and packet mangling tools.

  • package/iptables/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              iptables
    10 PKG_VERSION:=           1.3.5
     10PKG_VERSION:=           1.3.6
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            00fb916fa8040ca992a5ace56d905ea5
     12PKG_MD5SUM:=            077e886a9c90a11bb47f3d7a4fc4a689
    1313PKG_INIT:=              45
    1414

  • package/iptables/patches/01-ipp2p.patch

    r2f09cbe rb917538  
    1 diff -urN iptables.old/extensions/Makefile iptables.dev/extensions/Makefile
    2 --- iptables.old/extensions/Makefile    2005-07-20 04:22:56.000000000 +0200
    3 +++ iptables.dev/extensions/Makefile    2006-03-23 14:42:28.000000000 +0100
    4 @@ -8,6 +8,10 @@
    5  PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG
    6  PF6_EXT_SLIB:=eui64 hl icmpv6 length limit mac mark multiport owner physdev standard tcp udp HL LOG NFQUEUE MARK TRACE
    7  
    8 +
    9 +# ipp2p
    10 +PF_EXT_SLIB += ipp2p
    11 +
    12  # Optionals
    13  PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
    14  PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
    15 diff -urN iptables.old/extensions/libipt_ipp2p.c iptables.dev/extensions/libipt_ipp2p.c
    16 --- iptables.old/extensions/libipt_ipp2p.c      1970-01-01 01:00:00.000000000 +0100
    17 +++ iptables.dev/extensions/libipt_ipp2p.c      2006-03-23 14:43:26.000000000 +0100
     1diff -Nur iptables-1.3.6/extensions/libipt_ipp2p.c iptables-1.3.6.ipp2p/extensions/libipt_ipp2p.c
     2--- iptables-1.3.6/extensions/libipt_ipp2p.c    1970-01-01 01:00:00.000000000 +0100
     3+++ iptables-1.3.6.ipp2p/extensions/libipt_ipp2p.c      2006-09-30 13:27:55.000000000 +0200
    184@@ -0,0 +1,401 @@
    195+
    … …  
    418404+}
    419405+
    420 diff -urN iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
    421 --- iptables.old/include/linux/netfilter_ipv4/ipt_ipp2p.h       1970-01-01 01:00:00.000000000 +0100
    422 +++ iptables.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h       2006-03-23 14:44:26.000000000 +0100
     406diff -Nur iptables-1.3.6/extensions/Makefile iptables-1.3.6.ipp2p/extensions/Makefile
     407--- iptables-1.3.6/extensions/Makefile  2006-09-28 18:40:32.000000000 +0200
     408+++ iptables-1.3.6.ipp2p/extensions/Makefile    2006-09-30 13:24:45.000000000 +0200
     409@@ -13,6 +13,9 @@
     410 PF6_EXT_SE_SLIB:=SECMARK CONNSECMARK
     411 endif
     412 
     413+# ipp2p
     414+PF_EXT_SLIB += ipp2p
     415+
     416 # Optionals
     417 PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
     418 PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
     419diff -Nur iptables-1.3.6/include/linux/netfilter_ipv4/ipt_ipp2p.h iptables-1.3.6.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h
     420--- iptables-1.3.6/include/linux/netfilter_ipv4/ipt_ipp2p.h     1970-01-01 01:00:00.000000000 +0100
     421+++ iptables-1.3.6.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h       2006-09-30 13:23:16.000000000 +0200
    423422@@ -0,0 +1,31 @@
    424423+#ifndef __IPT_IPP2P_H
    425424+#define __IPT_IPP2P_H
    426 +#define IPP2P_VERSION "0.8.1_rc1"
     425+#define IPP2P_VERSION "0.8.2"
    427426+
    428427+struct ipt_p2p_info {

  • package/liblzo/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              lzo
    10 PKG_VERSION:=           1.08
     10PKG_VERSION:=           2.02
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            ab94d3da364c7cbd5b78d76f1875b0f6
     12PKG_MD5SUM:=            6760e5819f4238328709bf93bf10071c
    1313
    1414PKG_SOURCE_URL:=        http://www.oberhumer.com/opensource/lzo/download/
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
    1615
    1716include $(TOPDIR)/mk/package.mk
    … …  
    6160$(IPKG_LIBLZO):
    6261        install -d -m0755 $(IDIR_LIBLZO)/usr/lib
    63         $(CP) $(WRKINST)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib
     62        $(CP) $(WRKINST)/usr/lib/liblzo2.so.* $(IDIR_LIBLZO)/usr/lib
    6463        $(RSTRIP) $(IDIR_LIBLZO)
    6564        $(IPKG_BUILD) $(IDIR_LIBLZO) $(PACKAGE_DIR)
    6665
    67 $(STAGING_DIR)/usr/lib/liblzo.so: $(WRKBUILD)/.built
     66$(STAGING_DIR)/usr/lib/liblzo2.so: $(WRKBUILD)/.built
    6867        mkdir -p $(STAGING_DIR)/usr/include
    69         $(CP) $(WRKINST)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/
     68        $(CP) $(WRKINST)/usr/include/lzo $(STAGING_DIR)/usr/include/
    7069        mkdir -p $(STAGING_DIR)/usr/lib
    71         $(CP) $(WRKINST)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/
    72         touch $(STAGING_DIR)/usr/lib/liblzo.so
     70        $(CP) $(WRKINST)/usr/lib/liblzo2.{a,so*} $(STAGING_DIR)/usr/lib/
     71        touch $@
    7372
    74 install-dev: $(STAGING_DIR)/usr/lib/liblzo.so
     73install-dev: $(STAGING_DIR)/usr/lib/liblzo2.so
    7574
    7675uninstall-dev:
    7776        rm -rf \
    78           $(STAGING_DIR)/usr/include/lzo*.h \
    79           $(STAGING_DIR)/usr/lib/liblzo.{a,so*} \
     77          $(STAGING_DIR)/usr/include/lzo \
     78          $(STAGING_DIR)/usr/lib/liblzo2.{a,so*} \
    8079
    8180compile-targets: install-dev

  • package/mrd6/Config.in

    r2f09cbe rb917538  
    22        prompt "mrd6.............................. IPv6 multicast routing daemon"
    33        tristate
    4         default n if CONFIG_DEVEL
     4        select BUSYBOX_CONFIG_FEATURE_IPV6
     5        default n
    56        help
    67                Multicast is becoming a major component in next generation

  • package/mrd6/Makefile

    r2f09cbe rb917538  
    2727                SPACE_OPTIMIZE=yes \
    2828                FULL_STATIC=yes \
    29                 CFLAGS="$(TARGET_CFLAGS) -DNO_INET6_OPTION" \
     29                CFLAGS="$(TARGET_CFLAGS) -DNO_INET6_OPTION -lm" \
    3030                CXX=$(TARGET_CROSS)g++ \
    3131                CC=$(TARGET_CC) \

  • package/ndisc/Config.in

    r2f09cbe rb917538  
    99        prompt "ndisc6............................ An ICMPv6 neighbour discovery tool"
    1010        tristate
    11         default m if CONFIG_DEVEL
     11        default n
    1212        select FWRT_COMPILE_NDISC6
     13        select BUSYBOX_CONFIG_FEATURE_IPV6
    1314        help
    1415         
    … …  
    2021        prompt "rdisc6............................ An ICMPv6 router discovery tool"
    2122        tristate
    22         default m if CONFIG_DEVEL
     23        default n
    2324        select FWRT_COMPILE_NDISC6
     25        select BUSYBOX_CONFIG_FEATURE_IPV6
    2426        help
    2527         
    … …  
    3133        prompt "tcptraceroute6.................... A TCP/IPv6-based traceroute implementation"
    3234        tristate
    33         default m if CONFIG_DEVEL
     35        default n
    3436        select FWRT_COMPILE_NDISC6
     37        select BUSYBOX_CONFIG_FEATURE_IPV6
    3538        help
    3639         

  • package/openntpd/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              openntpd
    10 PKG_VERSION:=           3.7p1
    11 PKG_RELEASE:=           2
    12 PKG_MD5SUM:=            10ed8eefd760e5819efcf3277b118f47
     10PKG_VERSION:=           3.9p1
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            afc34175f38d08867c1403d9008600b3
     13PKG_INIT:=              55
    1314
    14 # space separated list or special @SF for sourceforge projects
    1515PKG_SOURCE_URL:=        ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
    1616                        ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \
    1717                        ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \
    1818                        ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/
    19 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
    2019
    2120include $(TOPDIR)/mk/package.mk
    … …  
    6160        install -m0644 ./files/ntpd.conf $(IDIR_OPENNTPD)/etc/
    6261        install -d -m0755 $(IDIR_OPENNTPD)/etc/init.d
    63         install -m0755 ./files/ntpd.init $(IDIR_OPENNTPD)/etc/init.d/S55ntpd
     62        install -m0755 ./files/ntpd.init $(IDIR_OPENNTPD)/etc/init.d/S$(PKG_INIT)ntpd
    6463        install -d -m0755 $(IDIR_OPENNTPD)/usr/sbin/
    6564        install -m0755 $(WRKBUILD)/ntpd $(IDIR_OPENNTPD)/usr/sbin/

  • package/openntpd/files/ntpd.init

    r2f09cbe rb917538  
    11#!/bin/sh
     2
    23. /etc/rc.conf
    3 mkdir -p /tmp/.ntp
    4 [ x"$ntpd_flags" = x"NO" ] || /usr/sbin/ntpd $ntpd_flags
     4
     5case $1 in
     6autostart)
     7        test x"$ntpd_flags" = x"NO" && exit 0
     8        exec $0 start
     9        ;;
     10start)
     11        mkdir -p /tmp/.ntp
     12        [ x"$ntpd_flags" = x"NO" ] || /usr/sbin/ntpd $ntpd_flags
     13stop)
     14        killall ntpd
     15        ;;
     16restart)
     17        $0 stop
     18        $0 start
     19        ;;
     20*)
     21        echo "Usage: $0 {start | stop | restart}"
     22        exit 1
     23        ;;
     24esac
     25exit $?

  • package/openntpd/patches/01-adjtimex_linux.patch

    r2f09cbe rb917538  
    1 diff -urN openntpd-3.7p1.orig/client.c openntpd-3.7p1/client.c
    2 --- openntpd-3.7p1.orig/client.c        2005-03-13 13:36:38.000000000 +0100
    3 +++ openntpd-3.7p1/client.c     2006-02-23 16:27:53.686827824 +0100
    4 @@ -306,7 +306,7 @@
     1diff -Nur openntpd-3.9p1/client.c openntpd-3.9p1.patched/client.c
     2--- openntpd-3.9p1/client.c     2006-05-14 07:29:21.000000000 +0200
     3+++ openntpd-3.9p1.patched/client.c     2006-09-30 12:41:07.000000000 +0200
     4@@ -321,7 +321,7 @@
    55        priv_adjtime();
    66 
    … …  
    1111 
    1212        return (0);
    13 diff -urN openntpd-3.7p1.orig/configure.ac openntpd-3.7p1/configure.ac
    14 --- openntpd-3.7p1.orig/configure.ac    2005-05-23 13:11:08.000000000 +0200
    15 +++ openntpd-3.7p1/configure.ac 2006-02-23 16:27:53.688827520 +0100
    16 @@ -466,6 +466,11 @@
    17         [ builtin_arc4random=$withval ]
    18  )
     13diff -Nur openntpd-3.9p1/configure.ac openntpd-3.9p1.patched/configure.ac
     14--- openntpd-3.9p1/configure.ac 2006-05-14 07:29:23.000000000 +0200
     15+++ openntpd-3.9p1.patched/configure.ac 2006-09-30 12:41:07.000000000 +0200
     16@@ -617,6 +617,11 @@
     17 fi
     18 AC_SUBST(mansubdir)
    1919 
    2020+AC_ARG_WITH(adjtimex,
    … …  
    2626 if test "$ac_cv_func_arc4random" != "yes" && test "x$builtin_arc4random" != "xyes"; then
    2727 saved_CPPFLAGS="$CPPFLAGS"
    28 diff -urN openntpd-3.7p1.orig/defines.h openntpd-3.7p1/defines.h
    29 --- openntpd-3.7p1.orig/defines.h       2005-05-23 02:16:33.000000000 +0200
    30 +++ openntpd-3.7p1/defines.h    2006-02-23 16:27:53.688827520 +0100
     28diff -Nur openntpd-3.9p1/defines.h openntpd-3.9p1.patched/defines.h
     29--- openntpd-3.9p1/defines.h    2006-05-14 07:29:21.000000000 +0200
     30+++ openntpd-3.9p1.patched/defines.h    2006-09-30 12:41:07.000000000 +0200
    3131@@ -20,6 +20,10 @@
    3232 # define setproctitle(x)
    … …  
    4040 # if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
    4141 #  define SA_LEN(x)    ((x)->sa_len)
    42 diff -urN openntpd-3.7p1.orig/openbsd-compat/Makefile.in openntpd-3.7p1/openbsd-compat/Makefile.in
    43 --- openntpd-3.7p1.orig/openbsd-compat/Makefile.in      2004-12-20 00:41:36.000000000 +0100
    44 +++ openntpd-3.7p1/openbsd-compat/Makefile.in   2006-02-23 16:27:53.901795144 +0100
     42diff -Nur openntpd-3.9p1/openbsd-compat/Makefile.in openntpd-3.9p1.patched/openbsd-compat/Makefile.in
     43--- openntpd-3.9p1/openbsd-compat/Makefile.in   2006-05-14 07:29:19.000000000 +0200
     44+++ openntpd-3.9p1.patched/openbsd-compat/Makefile.in   2006-09-30 12:41:07.000000000 +0200
    4545@@ -9,7 +9,7 @@
    46  OPENBSD=       asprintf.o daemon.o inet_pton.o strlcpy.o
    4746 COMPAT=                atomicio.o bsd-arc4random.o bsd-misc.o bsd-poll.o \
    48                 bsd-snprintf.o fake-rfc2553.o uidswap.o
     47                bsd-snprintf.o bsd-getifaddrs.o bsd-setresuid.o \
     48                bsd-setresgid.o fake-rfc2553.o
    4949-PORT=          port-qnx.o
    5050+PORT=          port-linux.o port-qnx.o
    … …  
    5252 VPATH=@srcdir@
    5353 CC=@CC@
    54 diff -urN openntpd-3.7p1.orig/openbsd-compat/openbsd-compat.h openntpd-3.7p1/openbsd-compat/openbsd-compat.h
    55 --- openntpd-3.7p1.orig/openbsd-compat/openbsd-compat.h 2004-12-19 04:04:22.000000000 +0100
    56 +++ openntpd-3.7p1/openbsd-compat/openbsd-compat.h      2006-02-23 16:27:53.948788000 +0100
    57 @@ -44,6 +44,11 @@
     54diff -Nur openntpd-3.9p1/openbsd-compat/openbsd-compat.h openntpd-3.9p1.patched/openbsd-compat/openbsd-compat.h
     55--- openntpd-3.9p1/openbsd-compat/openbsd-compat.h      2006-05-14 07:29:19.000000000 +0200
     56+++ openntpd-3.9p1.patched/openbsd-compat/openbsd-compat.h      2006-09-30 12:41:07.000000000 +0200
     57@@ -46,6 +46,11 @@
    5858                 __attribute__((__format__ (printf, 2, 3)));
    5959 #endif
    … …  
    6767 int inet_pton(int, const char *, void *);
    6868 #endif
    69 diff -urN openntpd-3.7p1.orig/openbsd-compat/port-linux.c openntpd-3.7p1/openbsd-compat/port-linux.c
    70 --- openntpd-3.7p1.orig/openbsd-compat/port-linux.c     1970-01-01 01:00:00.000000000 +0100
    71 +++ openntpd-3.7p1/openbsd-compat/port-linux.c  2006-02-23 16:27:53.996780704 +0100
     69diff -Nur openntpd-3.9p1/openbsd-compat/port-linux.c openntpd-3.9p1.patched/openbsd-compat/port-linux.c
     70--- openntpd-3.9p1/openbsd-compat/port-linux.c  1970-01-01 01:00:00.000000000 +0100
     71+++ openntpd-3.9p1.patched/openbsd-compat/port-linux.c  2006-09-30 12:41:07.000000000 +0200
    7272@@ -0,0 +1,105 @@
    7373+/* $Id$ */

  • package/openssh/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              openssh
    10 PKG_VERSION:=           4.2p1
    11 PKG_RELEASE:=           3
    12 PKG_MD5SUM:=            df899194a340c933944b193477c628fa
     10PKG_VERSION:=           4.4p1
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            793a709a8de695c22f523024d7e9bf07
    1313PKG_INIT:=              50
    1414

  • package/openssh/files/sshd.init

    r2f09cbe rb917538  
    11#!/bin/sh
    22
    3 for type in rsa dsa; do {
    4   # check for keys
    5   key=/etc/ssh/ssh_host_${type}_key
    6   [ ! -f $key ] && {
    7     # generate missing keys
    8     [ -x /usr/bin/ssh-keygen ] && {
    9       /usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&- && exec $0 $*
    10     } &
    11     exit 0
    12   }
    13 }; done
    14 mkdir -p /var/empty
    15 /usr/sbin/sshd
     3. /etc/rc.conf
     4
     5case $1 in
     6autostart)
     7        test x"$openssh" = x"NO" && exit 0
     8        exec $0 start
     9        ;;
     10start)
     11        for type in rsa dsa; do {
     12        # check for keys
     13                key=/etc/ssh/ssh_host_${type}_key
     14                [ -f $key ] || {
     15                mkdir -p /etc/ssh
     16                [ -x /usr/bin/ssh-keygen ] && {
     17                        /usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&-; \
     18                        rv=$?; \
     19                        fwcf commit 2>&1 | logger -t 'openssh-fwcf'; \
     20                        [ $rv -eq 0 ] && exec $0 $*; } &
     21                exit 0
     22                }
     23        done
     24        mkdir -p /var/empty
     25        /usr/sbin/sshd
     26stop)
     27        killall sshd
     28        ;;
     29restart)
     30        $0 stop
     31        $0 start
     32        ;;
     33*)
     34        echo "Usage: $0 {start | stop | restart}"
     35        exit 1
     36        ;;
     37esac
     38exit $?

  • package/openssh/ipkg/openssh-server.postinst

    r2f09cbe rb917538  
    33add_user sshd $(get_next_uid) $(get_next_gid) /var/run/sshd
    44add_group sshd $(get_next_gid)
    5 add_rcconf openssh sshd NO
     5add_rcconf openssh openssh YES

  • package/openssl/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              openssl
    10 PKG_VERSION:=           0.9.8c
     10PKG_VERSION:=           0.9.8d
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            78454bec556bcb4c45129428a766c886
     12PKG_MD5SUM:=            8ed1853538e1d05a1f5ada61ebf8bffa
    1313
    1414PKG_SOURCE_URL:=        http://www.openssl.org/source/ \

  • package/openswan/Makefile

    r2f09cbe rb917538  
    99
    1010PKG_NAME:=              openswan
    11 PKG_VERSION:=           2.4.5
     11PKG_VERSION:=           2.4.6
    1212PKG_RELEASE:=           1
    13 PKG_MD5SUM:=            a9a8e88313faceebfc5ceb1a9da9a3c4
     13PKG_MD5SUM:=            b34d71ca49dedad017879b0e912d40dd
     14PKG_INIT:=              60
    1415
    15 PKG_SOURCE_URL:=        http://www.openswan.org/download
    16 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
     16PKG_SOURCE_URL:=        http://www.openswan.org/download \
     17                        ftp://ftp.openswan.org/openswan/
    1718
    1819include $(TOPDIR)/mk/package.mk
    … …  
    5859                INC_USRLOCAL="/usr" \
    5960                install
    60         -$(STRIP) $(IDIR_OPENSWAN)/usr/lib/ipsec/*
    61         -$(STRIP) $(IDIR_OPENSWAN)/usr/libexec/ipsec/*
    6261        rm -rf $(IDIR_OPENSWAN)/usr/share
    6362        rm -rf $(IDIR_OPENSWAN)/usr/man
    … …  
    6665        mkdir -p $(IDIR_OPENSWAN)/etc/init.d
    6766        $(CP) $(IDIR_OPENSWAN)/etc/rc.d/init.d/ipsec \
    68                 $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
     67                $(IDIR_OPENSWAN)/etc/init.d/S$(PKG_INIT)ipsec
    6968        rm $(IDIR_OPENSWAN)/etc/rc.d/init.d/ipsec
    7069        find $(WRKBUILD) -name \*.old | xargs rm -rf
     70        $(RSTRIP) $(IDIR_OPENSWAN)
    7171        mkdir -p $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)
    7272        $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \

  • package/openswan/patches/scripts.patch

    r2f09cbe rb917538  
    1 diff -Nur openswan-2.4.5rc5/programs/loggerfix openswan-2.4.5rc5.patched/programs/loggerfix
    2 --- openswan-2.4.5rc5/programs/loggerfix        1970-01-01 01:00:00.000000000 +0100
    3 +++ openswan-2.4.5rc5.patched/programs/loggerfix        2006-03-29 01:20:44.000000000 +0200
     1diff -Nur openswan-2.4.6/programs/loggerfix openswan-2.4.6.scripts/programs/loggerfix
     2--- openswan-2.4.6/programs/loggerfix   1970-01-01 01:00:00.000000000 +0100
     3+++ openswan-2.4.6.scripts/programs/loggerfix   2006-09-29 15:53:35.000000000 +0200
    44@@ -0,0 +1,5 @@
    55+#!/bin/sh
    … …  
    88+echo "$*" >> /dev/null
    99+exit 0
    10 diff -Nur openswan-2.4.5rc5/programs/look/look.in openswan-2.4.5rc5.patched/programs/look/look.in
    11 --- openswan-2.4.5rc5/programs/look/look.in     2005-08-18 16:10:09.000000000 +0200
    12 +++ openswan-2.4.5rc5.patched/programs/look/look.in     2006-03-29 01:20:44.000000000 +0200
     10diff -Nur openswan-2.4.6/programs/look/look.in openswan-2.4.6.scripts/programs/look/look.in
     11--- openswan-2.4.6/programs/look/look.in        2005-08-18 16:10:09.000000000 +0200
     12+++ openswan-2.4.6.scripts/programs/look/look.in        2006-09-29 15:53:35.000000000 +0200
    1313@@ -84,7 +84,7 @@
    1414 then
    … …  
    2020                pat="$pat|$i\$"
    2121        done
    22 diff -Nur openswan-2.4.5rc5/programs/_plutorun/_plutorun.in openswan-2.4.5rc5.patched/programs/_plutorun/_plutorun.in
    23 --- openswan-2.4.5rc5/programs/_plutorun/_plutorun.in   2006-01-06 00:45:00.000000000 +0100
    24 +++ openswan-2.4.5rc5.patched/programs/_plutorun/_plutorun.in   2006-03-29 01:20:44.000000000 +0200
     22diff -Nur openswan-2.4.6/programs/_plutorun/_plutorun.in openswan-2.4.6.scripts/programs/_plutorun/_plutorun.in
     23--- openswan-2.4.6/programs/_plutorun/_plutorun.in      2006-04-21 17:41:45.000000000 +0200
     24+++ openswan-2.4.6.scripts/programs/_plutorun/_plutorun.in      2006-09-29 15:53:35.000000000 +0200
    2525@@ -147,7 +147,7 @@
    2626                        exit 1
    … …  
    3232                        echo Cannot write to directory to create \"$stderrlog\".
    3333                        exit 1
    34 diff -Nur openswan-2.4.5rc5/programs/_realsetup/_realsetup.in openswan-2.4.5rc5.patched/programs/_realsetup/_realsetup.in
    35 --- openswan-2.4.5rc5/programs/_realsetup/_realsetup.in 2005-07-28 02:23:48.000000000 +0200
    36 +++ openswan-2.4.5rc5.patched/programs/_realsetup/_realsetup.in 2006-03-29 01:20:44.000000000 +0200
    37 @@ -235,7 +235,7 @@
     34diff -Nur openswan-2.4.6/programs/_realsetup/_realsetup.in openswan-2.4.6.scripts/programs/_realsetup/_realsetup.in
     35--- openswan-2.4.6/programs/_realsetup/_realsetup.in    2006-05-05 20:49:45.000000000 +0200
     36+++ openswan-2.4.6.scripts/programs/_realsetup/_realsetup.in    2006-09-29 15:53:35.000000000 +0200
     37@@ -232,7 +232,7 @@
    3838 
    3939        # misc pre-Pluto setup
    … …  
    4444        if test " $IPSECforwardcontrol" = " yes"
    4545        then
    46 @@ -347,7 +347,7 @@
     46@@ -344,7 +344,7 @@
    4747                lsmod 2>&1 | grep "^xfrm_user" > /dev/null && rmmod -s xfrm_user
    4848        fi
    … …  
    5353        perform rm -f $info $lock $plutopid
    5454        perform echo "...Openswan IPsec stopped" "|" $LOGONLY
    55 diff -Nur openswan-2.4.5rc5/programs/send-pr/send-pr.in openswan-2.4.5rc5.patched/programs/send-pr/send-pr.in
    56 --- openswan-2.4.5rc5/programs/send-pr/send-pr.in       2005-04-18 01:04:46.000000000 +0200
    57 +++ openswan-2.4.5rc5.patched/programs/send-pr/send-pr.in       2006-03-29 01:20:44.000000000 +0200
     55diff -Nur openswan-2.4.6/programs/send-pr/send-pr.in openswan-2.4.6.scripts/programs/send-pr/send-pr.in
     56--- openswan-2.4.6/programs/send-pr/send-pr.in  2005-04-18 01:04:46.000000000 +0200
     57+++ openswan-2.4.6.scripts/programs/send-pr/send-pr.in  2006-09-29 15:53:35.000000000 +0200
    5858@@ -402,7 +402,7 @@
    5959                    else
    … …  
    9292                    fi
    9393                    echo "${fmtname}${desc}" >> $file
    94 diff -Nur openswan-2.4.5rc5/programs/setup/setup.in openswan-2.4.5rc5.patched/programs/setup/setup.in
    95 --- openswan-2.4.5rc5/programs/setup/setup.in   2005-07-25 21:17:03.000000000 +0200
    96 +++ openswan-2.4.5rc5.patched/programs/setup/setup.in   2006-03-29 01:20:44.000000000 +0200
     94diff -Nur openswan-2.4.6/programs/setup/setup.in openswan-2.4.6.scripts/programs/setup/setup.in
     95--- openswan-2.4.6/programs/setup/setup.in      2005-07-25 21:17:03.000000000 +0200
     96+++ openswan-2.4.6.scripts/programs/setup/setup.in      2006-09-29 15:53:35.000000000 +0200
    9797@@ -117,12 +117,22 @@
    9898 # do it
    … …  
    119119        outtmp=/var/run/pluto/ipsec_setup.out
    120120        (
    121 diff -Nur openswan-2.4.5rc5/programs/showhostkey/showhostkey.in openswan-2.4.5rc5.patched/programs/showhostkey/showhostkey.in
    122 --- openswan-2.4.5rc5/programs/showhostkey/showhostkey.in       2004-11-14 14:40:41.000000000 +0100
    123 +++ openswan-2.4.5rc5.patched/programs/showhostkey/showhostkey.in       2006-03-29 01:20:44.000000000 +0200
     121diff -Nur openswan-2.4.6/programs/showhostkey/showhostkey.in openswan-2.4.6.scripts/programs/showhostkey/showhostkey.in
     122--- openswan-2.4.6/programs/showhostkey/showhostkey.in  2004-11-14 14:40:41.000000000 +0100
     123+++ openswan-2.4.6.scripts/programs/showhostkey/showhostkey.in  2006-09-29 15:53:35.000000000 +0200
    124124@@ -63,7 +63,7 @@
    125125        exit 1
    … …  
    131131 awk '  BEGIN {
    132132                inkey = 0
    133 diff -Nur openswan-2.4.5rc5/programs/_startklips/_startklips.in openswan-2.4.5rc5.patched/programs/_startklips/_startklips.in
    134 --- openswan-2.4.5rc5/programs/_startklips/_startklips.in       2005-11-25 00:08:05.000000000 +0100
    135 +++ openswan-2.4.5rc5.patched/programs/_startklips/_startklips.in       2006-03-29 01:23:54.000000000 +0200
     133diff -Nur openswan-2.4.6/programs/_startklips/_startklips.in openswan-2.4.6.scripts/programs/_startklips/_startklips.in
     134--- openswan-2.4.6/programs/_startklips/_startklips.in  2006-05-09 20:34:34.000000000 +0200
     135+++ openswan-2.4.6.scripts/programs/_startklips/_startklips.in  2006-09-29 15:59:10.000000000 +0200
     136@@ -242,7 +242,7 @@
     137         fi
     138         if test -f $moduleinstplace/$wantgoo
     139         then
     140-                echo "modprobe failed, but found matching template module $wantgoo."
     141+                echo "insmod failed, but found matching template module $wantgoo."
     142                 echo "Copying $moduleinstplace/$wantgoo to $module."
     143                 rm -f $module
     144                 mkdir -p $moduleplace
    136145@@ -262,15 +262,15 @@
    137146     echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel"
    … …  
    153162 
    154163 if test -f $netkey
    155 @@ -278,21 +278,21 @@
     164@@ -278,25 +278,25 @@
    156165        klips=false
    157166        if test -f $modules
    … …  
    168177                # xfrm_user contains netlink support for IPsec
    169178-               modprobe -qv xfrm_user
    170 -               modprobe -qv hw_random
    171179+               insmod -qv xfrm_user
    172 +               insmod -qv hw_random
    173                 # padlock must load before aes module
    174 -               modprobe -qv padlock
    175 +               insmod -qv padlock
     180                if [ -n "`cat /proc/cpuinfo |grep Nehemiah`" ]
     181                then
     182                        echo "VIA Nehemiah detected, probing for PadLock"
     183-                       modprobe -qv hw_random
     184+                       insmod -qv hw_random
     185                        # padlock must load before aes module
     186-                       modprobe -qv padlock
     187+                       insmod -qv padlock
     188                fi
    176189                # load the most common ciphers/algo's
    177190-               modprobe -qv sha1
    … …  
    186199 fi
    187200 
    188 @@ -308,10 +308,10 @@
     201@@ -312,10 +312,10 @@
    189202                fi
    190203                 unset MODPATH MODULECONF        # no user overrides!
    … …  
    200213         if test ! -f $ipsecversion
    201214         then
    202 diff -Nur openswan-2.4.5rc5/programs/_startklips/_startklips.in.orig openswan-2.4.5rc5.patched/programs/_startklips/_startklips.in.orig
    203 --- openswan-2.4.5rc5/programs/_startklips/_startklips.in.orig  1970-01-01 01:00:00.000000000 +0100
    204 +++ openswan-2.4.5rc5.patched/programs/_startklips/_startklips.in.orig  2005-11-25 00:08:05.000000000 +0100
    205 @@ -0,0 +1,407 @@
    206 +#!/bin/sh
    207 +# KLIPS startup script
    208 +# Copyright (C) 1998, 1999, 2001, 2002  Henry Spencer.
    209 +#
    210 +# This program is free software; you can redistribute it and/or modify it
    211 +# under the terms of the GNU General Public License as published by the
    212 +# Free Software Foundation; either version 2 of the License, or (at your
    213 +# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
    214 +#
    215 +# This program is distributed in the hope that it will be useful, but
    216 +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
    217 +# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    218 +# for more details.
    219 +#
    220 +# RCSID $Id: scripts.patch 3639 2006-04-13 18:33:50Z nbd $
    221 +
    222 +me='ipsec _startklips'         # for messages
    223 +
    224 +# KLIPS-related paths
    225 +sysflags=/proc/sys/net/ipsec
    226 +modules=/proc/modules
    227 +# full rp_filter path is $rpfilter1/interface/$rpfilter2
    228 +rpfilter1=/proc/sys/net/ipv4/conf
    229 +rpfilter2=rp_filter
    230 +# %unchanged or setting (0, 1, or 2)
    231 +rpfiltercontrol=0
    232 +ipsecversion=/proc/net/ipsec_version
    233 +moduleplace=/lib/modules/`uname -r`/kernel/net/ipsec
    234 +bareversion=`uname -r | sed -e 's/\.nptl//' | sed -e 's/^\(2\.[0-9]\.[1-9][0-9]*-[1-9][0-9]*\(\.[0-9][0-9]*\)*\(\.x\)*\).*$/\1/'`
    235 +moduleinstplace=/lib/modules/$bareversion/kernel/net/ipsec
    236 +case $bareversion in
    237 +       2.6*)
    238 +               modulename=ipsec.ko
    239 +               ;;
    240 +       *)
    241 +               modulename=ipsec.o
    242 +               ;;
    243 +esac
    244 +
    245 +klips=true
    246 +netkey=/proc/net/pfkey
    247 +
    248 +info=/dev/null
    249 +log=daemon.error
    250 +for dummy
    251 +do
    252 +       case "$1" in
    253 +       --log)          log="$2" ; shift        ;;
    254 +       --info)         info="$2" ; shift       ;;
    255 +       --debug)        debug="$2" ; shift      ;;
    256 +       --omtu)         omtu="$2" ; shift       ;;
    257 +       --fragicmp)     fragicmp="$2" ; shift   ;;
    258 +       --hidetos)      hidetos="$2" ; shift    ;;
    259 +       --rpfilter)     rpfiltercontrol="$2" ; shift    ;;
    260 +       --)     shift ; break   ;;
    261 +       -*)     echo "$me: unknown option \`$1'" >&2 ; exit 2   ;;
    262 +       *)      break   ;;
    263 +       esac
    264 +       shift
    265 +done
    266 +
    267 +
    268 +
    269 +# some shell functions, to clarify the actual code
    270 +
    271 +# set up a system flag based on a variable
    272 +# sysflag value shortname default flagname
    273 +sysflag() {
    274 +       case "$1" in
    275 +       '')     v="$3"  ;;
    276 +       *)      v="$1"  ;;
    277 +       esac
    278 +       if test ! -f $sysflags/$4
    279 +       then
    280 +               if test " $v" != " $3"
    281 +               then
    282 +                       echo "cannot do $2=$v, $sysflags/$4 does not exist"
    283 +                       exit 1
    284 +               else
    285 +                       return  # can't set, but it's the default anyway
    286 +               fi
    287 +       fi
    288 +       case "$v" in
    289 +       yes|no) ;;
    290 +       *)      echo "unknown (not yes/no) $2 value \`$1'"
    291 +               exit 1
    292 +               ;;
    293 +       esac
    294 +       case "$v" in
    295 +       yes)    echo 1 >$sysflags/$4    ;;
    296 +       no)     echo 0 >$sysflags/$4    ;;
    297 +       esac
    298 +}
    299 +
    300 +# set up a Klips interface
    301 +klipsinterface() {
    302 +       # pull apart the interface spec
    303 +       virt=`expr $1 : '\([^=]*\)=.*'`
    304 +       phys=`expr $1 : '[^=]*=\(.*\)'`
    305 +       case "$virt" in
    306 +       ipsec[0-9])     ;;
    307 +       *)      echo "invalid interface \`$virt' in \`$1'" ; exit 1     ;;
    308 +       esac
    309 +
    310 +       # figure out ifconfig for interface
    311 +       addr=
    312 +       eval `ifconfig $phys |
    313 +               awk '$1 == "inet" && $2 ~ /^addr:/ && $NF ~ /^Mask:/ {
    314 +                       gsub(/:/, " ", $0)
    315 +                       print "addr=" $3
    316 +                       other = $5
    317 +                       if ($4 == "Bcast")
    318 +                               print "type=broadcast"
    319 +                       else if ($4 == "P-t-P")
    320 +                               print "type=pointopoint"
    321 +                       else if (NF == 5) {
    322 +                               print "type="
    323 +                               other = ""
    324 +                       } else
    325 +                               print "type=unknown"
    326 +                       print "otheraddr=" other
    327 +                       print "mask=" $NF
    328 +               }'`
    329 +       if test " $addr" = " "
    330 +       then
    331 +               echo "unable to determine address of \`$phys'"
    332 +               exit 1
    333 +       fi
    334 +       if test " $type" = " unknown"
    335 +       then
    336 +               echo "\`$phys' is of an unknown type"
    337 +               exit 1
    338 +       fi
    339 +       if test " $omtu" != " "
    340 +       then
    341 +               mtu="mtu $omtu"
    342 +       else
    343 +               mtu=
    344 +       fi
    345 +       echo "KLIPS $virt on $phys $addr/$mask $type $otheraddr $mtu" | logonly
    346 +
    347 +       if $klips
    348 +       then
    349 +               # attach the interface and bring it up
    350 +               ipsec tncfg --attach --virtual $virt --physical $phys
    351 +               ifconfig $virt inet $addr $type $otheraddr netmask $mask $mtu
    352 +       fi
    353 +
    354 +       # if %defaultroute, note the facts
    355 +       if test " $2" != " "
    356 +       then
    357 +               (
    358 +                       echo "defaultroutephys=$phys"
    359 +                       echo "defaultroutevirt=$virt"
    360 +                       echo "defaultrouteaddr=$addr"
    361 +                       if test " $2" != " 0.0.0.0"
    362 +                       then
    363 +                               echo "defaultroutenexthop=$2"
    364 +                       fi
    365 +               ) >>$info
    366 +       else
    367 +               echo '#dr: no default route' >>$info
    368 +       fi
    369 +
    370 +       # check for rp_filter trouble
    371 +       checkif $phys                   # thought to be a problem only on phys
    372 +}
    373 +
    374 +# check an interface for problems
    375 +checkif() {
    376 +       $klips || return 0
    377 +       rpf=$rpfilter1/$1/$rpfilter2
    378 +       if test -f $rpf
    379 +       then
    380 +               r="`cat $rpf`"
    381 +               if test " $r" != " 0"
    382 +               then
    383 +                       case "$r-$rpfiltercontrol" in
    384 +                       0-%unchanged|0-0|1-1|2-2)
    385 +                               # happy state
    386 +                               ;;
    387 +                       *-%unchanged)
    388 +                               echo "WARNING: $1 has route filtering turned on; KLIPS may not work ($rpf is $r)"
    389 +                               ;;
    390 +                       [012]-[012])
    391 +                               echo "WARNING: changing route filtering on $1 (changing $rpf from $r to $rpfiltercontrol)"
    392 +                               echo "$rpfiltercontrol" >$rpf
    393 +                               ;;
    394 +                       [012]-*)
    395 +                               echo "ERROR: unknown rpfilter setting: $rpfiltercontrol"
    396 +                               ;;
    397 +                       *)
    398 +                               echo "ERROR: unknown $rpf value $r"
    399 +                               ;;
    400 +                       esac
    401 +               fi
    402 +       fi
    403 +}
    404 +
    405 +# interfaces=%defaultroute:  put ipsec0 on top of default route's interface
    406 +defaultinterface() {
    407 +       phys=`netstat -nr |
    408 +               awk '$1 == "0.0.0.0" && $3 == "0.0.0.0" { print $NF }'`
    409 +       if test " $phys" = " "
    410 +       then
    411 +               echo "no default route, %defaultroute cannot cope!!!"
    412 +               exit 1
    413 +       fi
    414 +       if test `echo " $phys" | wc -l` -gt 1
    415 +       then
    416 +               echo "multiple default routes, %defaultroute cannot cope!!!"
    417 +               exit 1
    418 +       fi
    419 +       next=`netstat -nr |
    420 +               awk '$1 == "0.0.0.0" && $3 == "0.0.0.0" { print $2 }'`
    421 +       klipsinterface "ipsec0=$phys" $next
    422 +}
    423 +
    424 +# log only to syslog, not to stdout/stderr
    425 +logonly() {
    426 +       logger -p $log -t ipsec_setup
    427 +}
    428 +
    429 +# sort out which module is appropriate, changing it if necessary
    430 +setmodule() {
    431 +       if [ -e /proc/kallsyms ]
    432 +       then
    433 +               kernelsymbols="/proc/kallsyms";
    434 +               echo "calcgoo: warning: 2.6 kernel with kallsyms not supported yet"
    435 +       else
    436 +               kernelsymbols="/proc/ksyms";
    437 +       fi     
    438 +        wantgoo="`ipsec calcgoo $kernelsymbols`"
    439 +        module=$moduleplace/$modulename
    440 +        if test -f $module
    441 +        then
    442 +                goo="`nm -ao $module | ipsec calcgoo`"
    443 +                if test " $wantgoo" = " $goo"
    444 +                then
    445 +                        return          # looks right
    446 +                fi
    447 +        fi
    448 +        if test -f $moduleinstplace/$wantgoo
    449 +        then
    450 +                echo "modprobe failed, but found matching template module $wantgoo."
    451 +                echo "Copying $moduleinstplace/$wantgoo to $module."
    452 +                rm -f $module
    453 +                mkdir -p $moduleplace
    454 +                cp -p $moduleinstplace/$wantgoo $module
    455 +                # "depmod -a" gets done by caller
    456 +        fi
    457 +}
    458 +
    459 +
    460 +
    461 +# main line
    462 +
    463 +# load module if possible
    464 +if test -f $ipsecversion && test -f $netkey
    465 +then
    466 +    # both KLIPS and NETKEY code detected, bail out
    467 +    echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel"
    468 +    exit
    469 +fi
    470 +if test ! -f $ipsecversion && test ! -f $netkey && modprobe -qn ipsec
    471 +then
    472 +    # statically compiled KLIPS/NETKEY not found; try to load the module
    473 +    modprobe ipsec
    474 +fi
    475 +
    476 +if test ! -f $ipsecversion && test ! -f $netkey
    477 +then
    478 +       modprobe -v af_key
    479 +fi
    480 +
    481 +if test -f $netkey
    482 +then
    483 +       klips=false
    484 +       if test -f $modules
    485 +       then
    486 +               modprobe -qv ah4
    487 +               modprobe -qv esp4
    488 +               modprobe -qv ipcomp
    489 +               #  xfrm4_tunnel is needed by ipip and ipcomp
    490 +               modprobe -qv xfrm4_tunnel
    491 +               # xfrm_user contains netlink support for IPsec
    492 +               modprobe -qv xfrm_user
    493 +               modprobe -qv hw_random
    494 +               # padlock must load before aes module
    495 +               modprobe -qv padlock
    496 +               # load the most common ciphers/algo's
    497 +               modprobe -qv sha1
    498 +               modprobe -qv md5
    499 +               modprobe -qv des
    500 +               modprobe -qv aes
    501 +       fi
    502 +fi
    503 +
    504 +if test ! -f $ipsecversion && $klips
    505 +then
    506 +        if test -r $modules             # kernel does have modules
    507 +        then
    508 +               if [ ! -e /proc/ksyms -a ! -e /proc/kallsyms ]
    509 +               then
    510 +                       echo "Broken 2.6 kernel without kallsyms, skipping calcgoo (Fedora rpm?)"
    511 +               else
    512 +                       setmodule
    513 +               fi
    514 +                unset MODPATH MODULECONF        # no user overrides!
    515 +                depmod -a >/dev/null 2>&1
    516 +               modprobe -qv hw_random
    517 +               # padlock must load before aes module
    518 +               modprobe -qv padlock
    519 +                modprobe -v ipsec
    520 +        fi
    521 +        if test ! -f $ipsecversion
    522 +        then
    523 +                echo "kernel appears to lack IPsec support (neither CONFIG_KLIPS or CONFIG_NET_KEY are set)"
    524 +                exit 1
    525 +        fi
    526 +fi
    527 +
    528 +# figure out debugging flags
    529 +case "$debug" in
    530 +'')    debug=none      ;;
    531 +esac
    532 +if test -r /proc/net/ipsec_klipsdebug
    533 +then
    534 +       echo "KLIPS debug \`$debug'" | logonly
    535 +       case "$debug" in
    536 +       none)   ipsec klipsdebug --none ;;
    537 +       all)    ipsec klipsdebug --all  ;;
    538 +       *)      ipsec klipsdebug --none
    539 +               for d in $debug
    540 +               do
    541 +                       ipsec klipsdebug --set $d
    542 +               done
    543 +               ;;
    544 +       esac
    545 +elif $klips
    546 +then
    547 +       if test " $debug" != " none"
    548 +       then
    549 +               echo "klipsdebug=\`$debug' ignored, KLIPS lacks debug facilities"
    550 +       fi
    551 +fi
    552 +
    553 +# figure out misc. kernel config
    554 +if test -d $sysflags
    555 +then
    556 +       sysflag "$fragicmp" "fragicmp" yes icmp
    557 +       echo 1 >$sysflags/inbound_policy_check          # no debate
    558 +       sysflag no "no_eroute_pass" no no_eroute_pass   # obsolete parm
    559 +       sysflag no "opportunistic" no opportunistic     # obsolete parm
    560 +       sysflag "$hidetos" "hidetos" yes tos
    561 +elif $klips
    562 +then
    563 +       echo "WARNING: cannot adjust KLIPS flags, no $sysflags directory!"
    564 +       # carry on
    565 +fi
    566 +
    567 +if $klips
    568 +then
    569 +       # clear tables out in case dregs have been left over
    570 +       ipsec eroute --clear
    571 +       ipsec spi --clear
    572 +elif test $netkey
    573 +then
    574 +       if ip xfrm state > /dev/null 2>&1
    575 +       then
    576 +               ip xfrm state flush
    577 +               ip xfrm policy flush
    578 +       elif type setkey > /dev/null 2>&1
    579 +       then
    580 +               # Check that the setkey command is available.
    581 +               setkeycmd=       
    582 +               PATH=$PATH:/usr/local/sbin       
    583 +               for dir in `echo $PATH | tr ':' ' '`     
    584 +               do       
    585 +                       if test -f $dir/setkey -a -x $dir/setkey         
    586 +                       then
    587 +                               setkeycmd=$dir/setkey
    588 +                               break                   # NOTE BREAK OUT
    589 +                       fi
    590 +               done
    591 +               $setkeycmd -F
    592 +               $setkeycmd -FP
    593 +       else
    594 +       
    595 +               echo "WARNING: cannot flush state/policy database -- \`$1'. Install a newer version of iproute/iproute2 or install the ipsec-tools package to obtain the setkey command." |
    596 +                       logger -s -p daemon.error -t ipsec_setup
    597 +       fi
    598 +fi
    599 +
    600 +# figure out interfaces
    601 +for i
    602 +do
    603 +       case "$i" in
    604 +       ipsec*=?*)      klipsinterface "$i"     ;;
    605 +       %defaultroute)  defaultinterface        ;;
    606 +       *)      echo "interface \`$i' not understood"
    607 +               exit 1
    608 +               ;;
    609 +       esac
    610 +done
    611 +
    612 +exit 0

  • package/openvpn/Makefile

    r2f09cbe rb917538  
    88
    99PKG_NAME:=              openvpn
    10 PKG_VERSION:=           2.0.7
     10PKG_VERSION:=           2.0.8
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            93528233f1f6d02fc18e2c00f82e0aca
     12PKG_MD5SUM:=            de41592b6dd88d33b7c45c114a4f4e00
    1313PKG_INIT:=              60
    1414

  • package/raddump/Config.in

    r2f09cbe rb917538  
    22        prompt "raddump........................... raddump interprets captured RADIUS packets."
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default n
    55        select FWRT_PACKAGE_LIBOPENSSL
    66        select FWRT_PACKAGE_LIBPCAP

  • package/radvd/Config.in

    r2f09cbe rb917538  
    22        prompt "radvd............................. IPv6 Routing Advertisement Daemon"
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default n
    55        select FWRT_PACKAGE_KMOD_IPV6
     6        select BUSYBOX_CONFIG_FEATURE_IPV6
    67        help
    78          Routing Advertisement Daemon for IPv6

  • package/tinc/Config.in

    r2f09cbe rb917538  
    22        prompt "tinc.............................. VPN tunneling daemon"
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default n
    55        select FWRT_PACKAGE_KMOD_TUN
    66        select FWRT_PACKAGE_LIBLZO

  • package/tinc/Makefile

    r2f09cbe rb917538  
    4949                  --with-kernel=$(LINUX_DIR) \
    5050                  --with-zlib=$(STAGING_DIR)/usr/ \
     51                  --with-lzo-include=$(STAGING_DIR)/usr/include/lzo \
    5152        );
    5253        touch $@

  • package/vtun/Makefile

    r2f09cbe rb917538  
    1313
    1414PKG_SOURCE_URL:=        @SF/vtun
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
    1615
    1716WRKSRC=                 ${WRKDIR}/$(PKG_NAME)
    … …  
    2827                LIBS="-L$(STAGING_DIR)/usr/lib" \
    2928                BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
    30                 LZO_HDR_DIR="$(STAGING_DIR)/usr/include" \
     29                LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
    3130                SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
    3231                ./configure \

  • target/linux/generic-2.4/patches/601-netfilter_ipp2p.patch

    r2f09cbe rb917538  
    1 diff -urN linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
    2 --- linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h  1970-01-01 01:00:00.000000000 +0100
    3 +++ linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h  2006-03-23 14:37:56.000000000 +0100
     1diff -Nur linux-2.4.33.3/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.4.33.3.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h
     2--- linux-2.4.33.3/include/linux/netfilter_ipv4/ipt_ipp2p.h     1970-01-01 01:00:00.000000000 +0100
     3+++ linux-2.4.33.3.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h       2006-09-30 13:48:52.000000000 +0200
    44@@ -0,0 +1,31 @@
    55+#ifndef __IPT_IPP2P_H
    66+#define __IPT_IPP2P_H
    7 +#define IPP2P_VERSION "0.8.1_rc1"
     7+#define IPP2P_VERSION "0.8.2"
    88+
    99+struct ipt_p2p_info {
    … …  
    3434+#define IPP2P_WASTE            (1 << 15)
    3535+#define IPP2P_XDCC             (1 << 16)
    36 diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
    37 --- linux.old/net/ipv4/netfilter/Config.in      2006-03-23 14:35:20.000000000 +0100
    38 +++ linux.dev/net/ipv4/netfilter/Config.in      2006-03-23 14:35:58.000000000 +0100
    39 @@ -29,6 +29,7 @@
     36diff -Nur linux-2.4.33.3/net/ipv4/netfilter/Config.in linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Config.in
     37--- linux-2.4.33.3/net/ipv4/netfilter/Config.in 2006-08-31 19:03:20.000000000 +0200
     38+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Config.in   2006-09-30 13:45:19.000000000 +0200
     39@@ -26,6 +26,7 @@
    4040   dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
    4141   dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
    … …  
    4545   dep_tristate '  DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
    4646 
    47 diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
    48 --- linux.old/net/ipv4/netfilter/Makefile       2006-03-23 14:35:20.000000000 +0100
    49 +++ linux.dev/net/ipv4/netfilter/Makefile       2006-03-23 14:35:58.000000000 +0100
    50 @@ -76,6 +76,7 @@
    51  obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
    52  obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
    53  obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
    54 +obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
    55  
    56  obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
    57  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
    58 diff -urN linux.old/net/ipv4/netfilter/ipt_ipp2p.c linux.dev/net/ipv4/netfilter/ipt_ipp2p.c
    59 --- linux.old/net/ipv4/netfilter/ipt_ipp2p.c    1970-01-01 01:00:00.000000000 +0100
    60 +++ linux.dev/net/ipv4/netfilter/ipt_ipp2p.c    2006-03-23 14:37:18.000000000 +0100
    61 @@ -0,0 +1,868 @@
     47diff -Nur linux-2.4.33.3/net/ipv4/netfilter/ipt_ipp2p.c linux-2.4.33.3.ipp2p/net/ipv4/netfilter/ipt_ipp2p.c
     48--- linux-2.4.33.3/net/ipv4/netfilter/ipt_ipp2p.c       1970-01-01 01:00:00.000000000 +0100
     49+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/ipt_ipp2p.c 2006-09-30 13:47:58.000000000 +0200
     50@@ -0,0 +1,894 @@
    6251+#if defined(MODVERSIONS)
    6352+#include <linux/modversions.h>
    … …  
    790779+      const struct net_device *in,
    791780+      const struct net_device *out,
     781+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     782+      const struct xt_match  *mymatch,
    792783+      const void *matchinfo,
    793784+      int offset,
     785+      unsigned int myprotoff,
     786+#else
     787+      const void *matchinfo,
     788+      int offset,
     789+#endif
    794790+
    795791+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
    … …  
    878874+static int
    879875+checkentry(const char *tablename,
    880 +            const struct ipt_ip *ip,
    881 +           void *matchinfo,
    882 +           unsigned int matchsize,
    883 +           unsigned int hook_mask)
     876+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     877+           const void *ip,
     878+           const struct xt_match *mymatch,
     879+#else
     880+           const struct ipt_ip *ip,
     881+#endif
     882+          void *matchinfo,
     883+          unsigned int matchsize,
     884+          unsigned int hook_mask)
    884885+{
    885886+        /* Must specify -p tcp */
    … …  
    892893+                                                                           
    893894+
    894 +
     895+// TODO: find out what this structure is for (scheme taken
     896+// from kernel sources)
     897+// content seems to have a length of 8 bytes
     898+// (at least on my x86 machine)
     899+struct ipp2p_match_info {
     900+       long int dunno_what_this_is_for;
     901+       long int i_also_dunno_what_this_is_for;
     902+};
    895903+
    896904+static struct ipt_match ipp2p_match = {
    … …  
    903911+       THIS_MODULE
    904912+#endif
    905 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     913+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
    906914+       .name           = "ipp2p",
    907915+       .match          = &match,
    908916+       .checkentry     = &checkentry,
    909917+       .me             = THIS_MODULE,
     918+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     919+       .name           = "ipp2p",
     920+       .match          = &match,
     921+       .family         = AF_INET,
     922+       .matchsize      = sizeof(struct ipp2p_match_info),
     923+       .checkentry     = &checkentry,
     924+       .me             = THIS_MODULE,
    910925+#endif
    911926+};
    … …  
    928943+
    929944+
     945diff -Nur linux-2.4.33.3/net/ipv4/netfilter/Makefile linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Makefile
     946--- linux-2.4.33.3/net/ipv4/netfilter/Makefile  2006-08-31 19:03:20.000000000 +0200
     947+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Makefile    2006-09-30 13:45:19.000000000 +0200
     948@@ -67,6 +67,7 @@
     949 obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
     950 obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
     951 obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
     952+obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
     953 
     954 obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
     955 obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
Note: See TracChangeset for help on using the changeset viewer.