diff options
22 files changed, 167 insertions, 70 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 3c417135d..912d1abdc 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -47,7 +47,5 @@ post-install: ${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec ${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec ${INSTALL_BIN} ${WRKINST}/usr/sbin/ipsec ${IDIR_OPENSWAN}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/etc/rc.d/init.d/ipsec \ - ${IDIR_OPENSWAN}/usr/libexec/ipsec/setup include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure index c6e56a0b0..7d0b90b3f 100644 --- a/package/osiris/patches/patch-configure +++ b/package/osiris/patches/patch-configure @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/configure 2009-05-10 21:10:24.000000000 +0200 ++++ osiris-4.2.3/configure 2009-12-11 21:26:32.000000000 +0100 +@@ -3403,7 +3403,7 @@ else + fi + + +-OS_NAME=`uname` ++OS_NAME=Linux + AUTOHEADER=echo + + if test "x$prefix" = "xNONE" ; then @@ -3738,7 +3738,7 @@ CYGWIN*) esac diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 753349c93..295c19b0e 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ppp PKG_VERSION:= 2.4.4 -PKG_RELEASE:= 16 +PKG_RELEASE:= 17 PKG_MD5SUM:= 183800762e266132218b204dfb428d29 PKG_DESCR:= a PPP (Point-to-Point Protocol) software (with MPPE/MPPC support) PKG_SECTION:= net @@ -25,6 +25,7 @@ $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PK $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= UNAME_S="Linux" BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 99197f9eb..301fb2dbc 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= quagga -PKG_VERSION:= 0.99.12 +PKG_VERSION:= 0.99.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= d2bb513f4ac113dbb300c15a0bd0a241 +PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce PKG_DESCR:= A routing software package PKG_SECTION:= net PKG_URL:= http://www.quagga.net @@ -33,6 +33,7 @@ $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE} $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= quagga_cv_ipforward_method="proc" CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --sysconfdir=/etc/quagga \ --enable-vtysh \ @@ -50,7 +51,6 @@ post-install: # avoid /etc being set to 0750 ${INSTALL_DIR} ${IDIR_QUAGGA}/etc/quagga/ chmod 0750 ${IDIR_QUAGGA}/etc/quagga/ - ${INSTALL_DIR} ${IDIR_QUAGGA}/var/run/quagga ${INSTALL_DIR} ${IDIR_QUAGGA_BGPD}/usr/sbin ${CP} ${WRKINST}/usr/sbin/bgpd ${IDIR_QUAGGA_BGPD}/usr/sbin/ ${INSTALL_DIR} ${IDIR_QUAGGA_OSPFD}/usr/{lib,sbin} diff --git a/package/radvd/Config.in b/package/radvd/Config.in index ef729c098..32586c2aa 100644 --- a/package/radvd/Config.in +++ b/package/radvd/Config.in @@ -3,6 +3,7 @@ config ADK_PACKAGE_RADVD tristate default n select ADK_KPACKAGE_KMOD_IPV6 + depends on !ADK_HOST_FREEBSD # flex problem help Routing Advertisement Daemon for IPv6 http://v6web.litech.org/radvd/ diff --git a/package/shorewall-common/patches/patch-install_sh b/package/shorewall-common/patches/patch-install_sh index 715d0130a..b9ed10574 100644 --- a/package/shorewall-common/patches/patch-install_sh +++ b/package/shorewall-common/patches/patch-install_sh @@ -1,6 +1,6 @@ $Id$ ---- shorewall-common-4.0.5.orig/install.sh 2007-10-19 16:33:06.000000000 +0000 -+++ shorewall-common-4.0.5/install.sh 2007-10-23 23:33:47.000000000 +0000 +--- shorewall-common-4.0.7.orig/install.sh 2007-12-26 22:15:47.000000000 +0100 ++++ shorewall-common-4.0.7/install.sh 2009-12-11 23:10:40.000000000 +0100 @@ -183,7 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/ # # Determine where to install the firewall script @@ -52,7 +52,28 @@ $Id$ # # Install the zones file # -@@ -704,43 +683,6 @@ echo "Man Pages Installed" +@@ -683,15 +662,18 @@ fi + + cd manpages + ++run_install -d ${PREFIX}/usr/share/man/man5 ++run_install -d ${PREFIX}/usr/share/man/man8 ++ + for f in *.5; do + gzip -c $f > $f.gz +- run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz ++ run_install -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz + echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz" + done + + for f in *.8; do + gzip -c $f > $f.gz +- run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz ++ run_install -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz + echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz" + done + +@@ -704,43 +686,6 @@ echo "Man Pages Installed" # install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0755 diff --git a/package/shorewall-common/patches/patch-shorewall_conf b/package/shorewall-common/patches/patch-shorewall_conf index 80a55f3e9..c6b781088 100644 --- a/package/shorewall-common/patches/patch-shorewall_conf +++ b/package/shorewall-common/patches/patch-shorewall_conf @@ -1,7 +1,7 @@ $Id$ ---- shorewall-3.4.5.orig/shorewall.conf 2007-06-20 14:30:57.000000000 +0000 -+++ shorewall-3.4.5/shorewall.conf 2007-07-17 11:08:12.000000000 +0000 -@@ -71,7 +71,7 @@ SHOREWALL_SHELL=/bin/sh +--- shorewall-common-4.0.7.orig/shorewall.conf 2007-12-10 22:17:04.000000000 +0100 ++++ shorewall-common-4.0.7/shorewall.conf 2009-12-11 22:58:41.000000000 +0100 +@@ -72,7 +72,7 @@ SHOREWALL_SHELL=/bin/sh SUBSYSLOCK=/var/lock/subsys/shorewall diff --git a/package/squid/patches/patch-include_squid_types_h b/package/squid/patches/patch-include_squid_types_h new file mode 100644 index 000000000..538c1da5f --- /dev/null +++ b/package/squid/patches/patch-include_squid_types_h @@ -0,0 +1,26 @@ +--- squid-3.0.STABLE20.orig/include/squid_types.h 2009-10-29 11:05:43.000000000 +0100 ++++ squid-3.0.STABLE20/include/squid_types.h 2009-12-11 23:40:46.000000000 +0100 +@@ -60,9 +60,11 @@ + #if HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif ++#ifndef __FreeBSD__ + #if HAVE_LINUX_TYPES_H + #include <linux/types.h> + #endif ++#endif + #if STDC_HEADERS + #include <stdlib.h> + #include <stddef.h> +@@ -70,9 +72,11 @@ + #if HAVE_INTTYPES_H + #include <inttypes.h> + #endif ++#ifndef __FreeBSD__ + #if HAVE_SYS_BITYPES_H + #include <sys/bitypes.h> + #endif ++#endif + #if HAVE_SYS_SELECT_H + #include <sys/select.h> + #endif diff --git a/package/squid/patches/patch-src_HttpHeaderTools_cc b/package/squid/patches/patch-src_HttpHeaderTools_cc index 3b456ebf5..e05cd9340 100644 --- a/package/squid/patches/patch-src_HttpHeaderTools_cc +++ b/package/squid/patches/patch-src_HttpHeaderTools_cc @@ -1,6 +1,6 @@ ---- squid-3.0.STABLE15.orig/src/HttpHeaderTools.cc 2009-05-06 13:11:40.000000000 +0200 -+++ squid-3.0.STABLE15/src/HttpHeaderTools.cc 2009-06-15 18:29:41.000000000 +0200 -@@ -356,7 +356,7 @@ httpHeaderParseQuotedString (const char +--- squid-3.0.STABLE20.orig/src/HttpHeaderTools.cc 2009-10-29 11:05:45.000000000 +0100 ++++ squid-3.0.STABLE20/src/HttpHeaderTools.cc 2009-12-11 23:14:13.000000000 +0100 +@@ -357,7 +357,7 @@ httpHeaderParseQuotedString (const char pos = start + 1; while (1) { diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am index 0f1e322b5..2b9bbbe68 100644 --- a/package/squid/patches/patch-src_Makefile_am +++ b/package/squid/patches/patch-src_Makefile_am @@ -1,5 +1,5 @@ ---- squid-3.0.STABLE18.orig/src/Makefile.am 2009-08-04 13:57:48.000000000 +0200 -+++ squid-3.0.STABLE18/src/Makefile.am 2009-08-23 18:12:19.744829620 +0200 +--- squid-3.0.STABLE20.orig/src/Makefile.am 2009-10-29 11:05:46.000000000 +0100 ++++ squid-3.0.STABLE20/src/Makefile.am 2009-12-11 23:26:08.000000000 +0100 @@ -1010,6 +1010,7 @@ DEFAULT_MIB_PATH = $(datadir)/mib.txt DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ @@ -15,7 +15,7 @@ +cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) + $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \ + $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \ -+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ++ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ${HOSTCFLAGS} + cf_parser.h: cf.data cf_gen$(EXEEXT) ./cf_gen cf.data $(srcdir)/cf.data.depend diff --git a/package/srelay/Makefile b/package/srelay/Makefile index 4c3f09d5e..c2372448b 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= srelay -PKG_VERSION:= 0.4.6 -PKG_RELEASE:= 9 -PKG_MD5SUM:= 4a9f3298b38d8588f0ffde31b946a47f +PKG_VERSION:= 0.4.7b2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 73904ecbb5d305135b3e8907ce7d0513 PKG_DESCR:= A socks 4/5 proxy server PKG_SECTION:= net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/} @@ -15,7 +15,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= autoconf gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_lib_nsl_getaddrinfo=no CONFIGURE_ARGS+= --disable-thread \ --with-libwrap=no diff --git a/package/srelay/patches/01-cross_compile.patch b/package/srelay/patches/01-cross_compile.patch deleted file mode 100644 index 03d7fa215..000000000 --- a/package/srelay/patches/01-cross_compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN srelay-0.4.6/configure srelay-0.4.6.new/configure ---- srelay-0.4.6.orig/configure 2003-04-14 07:36:15.000000000 +0200 -+++ srelay-0.4.6/configure 2009-06-05 18:03:20.000000000 +0200 -@@ -1395,7 +1395,7 @@ _ACEOF - ;; - linux*) - case "$build_cpu" in -- i*86) -+ i*86 | mips* | powerpc* | sparc* | x86_64*) - OS=LINUX - cat >>confdefs.h <<\_ACEOF - #define LINUX 1 diff --git a/package/srelay/patches/patch-configure b/package/srelay/patches/patch-configure new file mode 100644 index 000000000..b4a4e5999 --- /dev/null +++ b/package/srelay/patches/patch-configure @@ -0,0 +1,48 @@ +--- srelay-0.4.7b2.orig/configure 2009-08-30 15:06:32.000000000 +0200 ++++ srelay-0.4.7b2/configure 2009-12-11 23:56:31.000000000 +0100 +@@ -1858,43 +1858,11 @@ test -n "$target_alias" && + NONENONEs,x,x, && + program_prefix=${target_alias}- + +-case "$build_os" in +- freebsd*) +- OS=FREEBSD +- cat >>confdefs.h <<\_ACEOF +-#define FREEBSD 1 +-_ACEOF +- +- ;; +- solaris*) +- OS=SOLARIS +- cat >>confdefs.h <<\_ACEOF +-#define SOLARIS 1 +-_ACEOF +- +- ;; +- linux*) +- case "$build_cpu" in +- i*86) +- OS=LINUX +- cat >>confdefs.h <<\_ACEOF ++OS=LINUX ++cat >>confdefs.h <<\_ACEOF + #define LINUX 1 + _ACEOF + +- ;; +- esac +- ;; +- darwin*) +- OS=MACOSX +- cat >>confdefs.h <<\_ACEOF +-#define MACOSX 1 +-_ACEOF +- +- ;; +-esac +- +-CFLAGS="$CFLAGS -O2 -Wall" +- + if test -d /usr/local/lib; then + LIBS="-L/usr/local/lib $LIBS" + fi diff --git a/package/srelay/patches/patch-configure_in b/package/srelay/patches/patch-configure_in deleted file mode 100644 index 46e2a9aeb..000000000 --- a/package/srelay/patches/patch-configure_in +++ /dev/null @@ -1,20 +0,0 @@ ---- srelay-0.4.6.orig/configure.in 2003-04-14 07:36:15.000000000 +0200 -+++ srelay-0.4.6/configure.in 2009-06-05 18:11:26.000000000 +0200 -@@ -15,7 +15,7 @@ case "$build_os" in - ;; - linux*) - case "$build_cpu" in -- i*86) -+ i*86 | mips* | powerpc* | sparc* | x86_64*) - OS=LINUX - AC_DEFINE(LINUX) - ;; -@@ -23,7 +23,7 @@ case "$build_os" in - ;; - esac - --CFLAGS="$CFLAGS -O2 -Wall" -+CFLAGS="$CFLAGS -Wall" - LDFLAGS="$LDFLAGS -s" - - dnl Local libralies. diff --git a/package/tar/Makefile b/package/tar/Makefile index a38e55e67..c1a3823fb 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TAR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= gl_cv_func_mbrtowc_incomplete_state=no \ + gl_cv_func_wcrtomb_retval=no BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/tcl/Makefile b/package/tcl/Makefile index a4e9b87fd..939eceaa7 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TCL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCFLAGS+= -ldl CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ tcl_cv_strtod_buggy=ok \ diff --git a/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c b/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c new file mode 100644 index 000000000..06c053779 --- /dev/null +++ b/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c @@ -0,0 +1,11 @@ +--- udev-142.orig/extras/cdrom_id/cdrom_id.c 2009-04-23 15:02:36.000000000 +0200 ++++ udev-142/extras/cdrom_id/cdrom_id.c 2009-12-12 00:20:04.000000000 +0100 +@@ -140,7 +140,7 @@ static void scsi_cmd_set(struct udev *ud + cmd->sg_io.mx_sb_len = sizeof(cmd->_sense); + cmd->sg_io.cmdp = cmd->cgc.cmd; + cmd->sg_io.sbp = cmd->_sense.u; +- cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO; ++ cmd->sg_io.flags = SG_FLAG_UNUSED_LUN_INHIBIT | SG_FLAG_DIRECT_IO; + } + cmd->sg_io.cmd_len = i + 1; + cmd->cgc.cmd[i] = arg; diff --git a/package/ulogd/patches/patch-Makefile_in b/package/ulogd/patches/patch-Makefile_in new file mode 100644 index 000000000..1eaedec61 --- /dev/null +++ b/package/ulogd/patches/patch-Makefile_in @@ -0,0 +1,14 @@ +--- ulogd-1.24.orig/Makefile.in 2006-01-25 12:26:51.000000000 +0100 ++++ ulogd-1.24/Makefile.in 2009-12-12 00:23:18.000000000 +0100 +@@ -78,9 +78,9 @@ clean: + install: all + @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done + @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) +- @INSTALL@ -D -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd ++ @INSTALL@ -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd + @[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR) +- @[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -D -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf ++ @[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf + + doc: + $(MAKE) -C $@ diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 7c87147ed..bb8ae3b07 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -29,7 +29,7 @@ post-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/valgrind $(IDIR_VALGRIND)/usr/bin/ $(CP) $(WRKINST)/usr/lib/valgrind/${ARCH}-linux/* \ $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux - rm $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux/*.a + -rm $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux/*.a touch $(IDIR_VALGRIND)/usr/lib/valgrind/default.supp include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure index 07bea76d5..c49444d12 100644 --- a/package/valgrind/patches/patch-configure +++ b/package/valgrind/patches/patch-configure @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- valgrind-3.3.1.orig/configure 2008-06-01 03:44:42.000000000 +0200 -+++ valgrind-3.3.1/configure 2009-06-02 01:32:59.000000000 +0200 ++++ valgrind-3.3.1/configure 2009-12-12 00:28:43.000000000 +0100 +@@ -4129,7 +4129,7 @@ echo "${ECHO_T}ok (${host_os})" >&6 + echo "$as_me:$LINENO: checking for the kernel version" >&5 + echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6 + +- kernel=`uname -r` ++ kernel=2.6.32 + + case "${kernel}" in + 2.6.*) @@ -4637,6 +4637,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& fi rm -f conftest* diff --git a/package/vtun/Config.in b/package/vtun/Config.in index d3354da55..715144fd2 100644 --- a/package/vtun/Config.in +++ b/package/vtun/Config.in @@ -5,6 +5,7 @@ config ADK_PACKAGE_VTUN select ADK_PACKAGE_LIBLZO select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_ZLIB + depends on !ADK_HOST_FREEBSD # flex problem help A VPN tunneling daemon diff --git a/package/wpa_supplicant/patches/patch-Makefile b/package/wpa_supplicant/patches/patch-Makefile deleted file mode 100644 index 6b33a653d..000000000 --- a/package/wpa_supplicant/patches/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$Id$ ---- wpa_supplicant-0.5.8.orig/Makefile Tue May 29 02:08:25 2007 -+++ wpa_supplicant-0.5.8/Makefile Sun Oct 21 20:55:37 2007 -@@ -3,7 +3,8 @@ CC=gcc - endif - - ifndef CFLAGS --CFLAGS = -MMD -O2 -Wall -g -+OPT_FLAGS = -O2 -g -+CFLAGS = -MMD $(OPT_FLAGS) -Wall - endif - - # Include directories for CVS version |