diff options
55 files changed, 457 insertions, 508 deletions
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index 0afba1946..9d7cdf971 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -23,6 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV})) +TARGET_LDFLAGS+= -lintl + libsdl-ttf-install: $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index fdf7a805b..21606c2e4 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673 PKG_DESCR:= Ethernet bridging tools PKG_SECTION:= bridge -PKG_DEPENDS:= kmod-bridge +PKG_DEPENDS:= kmod-bridge kmod-ipv6 PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} diff --git a/package/ccid/Makefile b/package/ccid/Makefile index e11ca53f9..3d8ca72e8 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= crypto PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html -PKG_SITES:= http://alioth.debian.org/frs/download.php/3579/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_ARCH_DEPENDS:= !avr32 diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 189a460be..4b718b07d 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cifs-utils PKG_VERSION:= 6.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 371e007a201be90c16497cd9bd5e2553 PKG_DESCR:= CIFS utilities PKG_SECTION:= net/fs @@ -19,6 +19,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-cifsupcall \ + --disable-cifsidmap \ + --disable-cifsacl + cifs-utils-install: $(INSTALL_DIR) $(IDIR_CIFS_UTILS)/usr/sbin $(INSTALL_BIN) $(WRKINST)/sbin/mount.cifs \ diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index b7b9a6d81..7daada275 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux -PKG_VERSION:= 1.4 +PKG_VERSION:= 1.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7b0ac1c0a88d8fbe7316db02f21666e6 +PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto PKG_BUILDDEP:= openssl @@ -24,7 +24,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - #${MAKE} -C "${WRKBUILD}"/tests check + ${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules diff --git a/package/cryptodev-linux/patches/patch-tests_Makefile b/package/cryptodev-linux/patches/patch-tests_Makefile new file mode 100644 index 000000000..4f774260f --- /dev/null +++ b/package/cryptodev-linux/patches/patch-tests_Makefile @@ -0,0 +1,16 @@ +--- cryptodev-linux-1.6.orig/tests/Makefile 2013-03-04 04:59:29.000000000 +0100 ++++ cryptodev-linux-1.6/tests/Makefile 2013-07-17 14:45:18.000000000 +0200 +@@ -20,13 +20,6 @@ example-async-speed-objs := async_speed. + example-hashcrypt-speed-objs := hashcrypt_speed.c + + check: $(hostprogs) +- ./cipher +- ./hmac +- ./async_cipher +- ./async_hmac +- ./cipher-aead-srtp +- ./cipher-gcm +- ./cipher-aead + + clean: + rm -f *.o *~ $(hostprogs) diff --git a/package/daq/Makefile b/package/daq/Makefile new file mode 100644 index 000000000..f6bcd0501 --- /dev/null +++ b/package/daq/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= daq +PKG_VERSION:= 2.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae +PKG_DESCR:= daq +PKG_SECTION:= libs +PKG_DEPENDS:= libpcap +PKG_BUILDDEP:= libpcap +PKG_URL:= http://www.snort.org +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +daq-install: + $(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq + $(CP) $(WRKINST)/usr/lib/daq/*.so \ + $(IDIR_DAQ)/usr/lib/daq + $(CP) $(WRKINST)/usr/lib/*.so* \ + $(IDIR_DAQ)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/daq/patches/patch-configure b/package/daq/patches/patch-configure new file mode 100644 index 000000000..e23ab323a --- /dev/null +++ b/package/daq/patches/patch-configure @@ -0,0 +1,56 @@ +--- daq-2.0.0.orig/configure 2012-11-05 22:07:56.000000000 +0100 ++++ daq-2.0.0/configure 2013-07-17 11:03:24.000000000 +0200 +@@ -12771,53 +12771,6 @@ fi + echo + exit 1 + fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5 +-$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; } +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include <pcap.h> +- #include <string.h> +- extern char pcap_version[]; +- +-int +-main () +-{ +- +- if (strcmp(pcap_version, "1.0.0") < 0) +- return 1; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- libpcap_version_1x="yes" +-else +- libpcap_version_1x="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- if test "x$libpcap_version_1x" = "xno"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo " ERROR! Libpcap library version >= "1.0.0" not found." +- echo " Get it from http://www.tcpdump.org" +- echo +- exit 1 +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- fi + + if test "$enable_pcap_module" = yes; then + STATIC_LIBS="${STATIC_LIBS} -lpcap" diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index ac8a41c64..d9a58ce87 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -16,7 +16,8 @@ PKG_BUILDDEP:= libunistring zlib confuse avahi sqlite ffmpeg dbus PKG_BUILDDEP+= mxml libevent libavl libantlr3c alsa-lib libgcrypt PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/ -PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER +PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER@ +PKG_CFLINE_FORKED_DAAPD+= depends on ADK_BROKEN@ PKG_ARCH_DEPENDS:= !ppc !avr32 # gperf problem PKG_HOST_DEPENDS:= !freebsd diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index b39f97a8c..ef3a52f4a 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= htpdate -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= a3da5ad8965345eb734695c765010acf +PKG_MD5SUM:= 40f193e3d7220265f6e6f8d4d7f887da PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation PKG_SECTION:= ntp PKG_URL:= http://www.vervest.org/htp/ -PKG_SITES:= http://www.clevervest.com/htp/archive/c/ +PKG_SITES:= http://www.vervest.org/htp/archive/c/ include ${TOPDIR}/mk/package.mk diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 87bfb96a4..71ea329fe 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,5 +1,5 @@ --- ipsec-tools-0.8.0.orig/configure 2011-03-18 14:27:41.000000000 +0100 -+++ ipsec-tools-0.8.0/configure 2011-03-31 13:16:18.091819156 +0200 ++++ ipsec-tools-0.8.0/configure 2013-07-17 14:30:31.000000000 +0200 @@ -11535,7 +11535,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } @@ -9,6 +9,17 @@ case $host in *netbsd*) +@@ -11627,8 +11627,8 @@ else + fi + + +- as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/linux/pfkeyv2.h" | $as_tr_sh` +-ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" ++ as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" + if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + + else @@ -12286,7 +12286,7 @@ $as_echo "$as_me: WARNING: Using a gener { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5 $as_echo_n "checking if printf accepts %z... " >&6; } @@ -36,3 +47,21 @@ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +@@ -14253,7 +14253,7 @@ linux*) + # Linux kernel NAT-T check + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <linux/pfkeyv2.h> ++#include <uapi/linux/pfkeyv2.h> + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif +@@ -14440,7 +14440,7 @@ linux*) + # Linux kernel Security Context check + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <linux/pfkeyv2.h> ++#include <uapi/linux/pfkeyv2.h> + #ifdef SADB_X_EXT_SEC_CTX + yes + #endif diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in new file mode 100644 index 000000000..f594f5d92 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in @@ -0,0 +1,24 @@ +--- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in 2011-03-18 14:27:40.000000000 +0100 ++++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in 2013-07-17 14:35:36.000000000 +0200 +@@ -183,7 +183,7 @@ EXTRA_DIST = \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux + all: all-am + + .SUFFIXES: +@@ -370,11 +370,7 @@ uninstall-am: + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +-.includes: ${top_builddir}/config.status +- ln -sf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes ++all: + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c index e8f678186..ec4cf4591 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c +++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c @@ -1,5 +1,5 @@ --- ipsec-tools-0.8.0.orig/src/racoon/privsep.c 2011-03-06 09:28:10.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/privsep.c 2011-03-31 13:24:07.981813178 +0200 ++++ ipsec-tools-0.8.0/src/racoon/privsep.c 2013-07-17 14:18:50.000000000 +0200 @@ -359,7 +359,7 @@ privsep_init(void) strerror(errno)); goto out; @@ -18,7 +18,7 @@ /* -@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) +@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index a4df8b3b4..201c0cb65 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -147,7 +147,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ ${CONFIGURE_DIRECTFB} XAKE_FLAGS+= AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" -TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis +TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis -lintl post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin diff --git a/package/php/Makefile b/package/php/Makefile index 05b97257b..f6c97d2db 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php PKG_VERSION:= 5.4.17 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cc698032dcdcb9ad158edcc90fe798d6 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang @@ -107,7 +107,6 @@ PKG_CONFIGURE_OPTS:= \ --without-pear \ --without-gettext \ --without-iconv \ - --without-libxml-dir \ --with-pcre-regex=no \ --with-kerberos=no @@ -201,7 +200,7 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml +PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml --with-libxml-dir="$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --disable-simplexml --disable-libxml endif diff --git a/package/php/patches/patch-ext_gd_libgd_gd_compat_c b/package/php/patches/patch-ext_gd_libgd_gd_compat_c new file mode 100644 index 000000000..971de9db6 --- /dev/null +++ b/package/php/patches/patch-ext_gd_libgd_gd_compat_c @@ -0,0 +1,10 @@ +--- php-5.4.17.orig/ext/gd/libgd/gd_compat.c 2013-07-03 08:10:53.000000000 +0200 ++++ php-5.4.17/ext/gd/libgd/gd_compat.c 2013-07-17 13:09:52.000000000 +0200 +@@ -5,6 +5,7 @@ + #endif + + #ifdef HAVE_GD_JPG ++# include <stdio.h> + # include <jpeglib.h> + #endif + diff --git a/package/snort/Makefile b/package/snort/Makefile index d8d1fc185..acf778e8a 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -4,31 +4,30 @@ include ${TOPDIR}/rules.mk PKG_NAME:= snort -PKG_VERSION:= 2.8.5.2 +PKG_VERSION:= 2.9.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6a8bc5aa1ebe4d2100533d7709c4a9e +PKG_MD5SUM:= f5fc0e176afca5989d47509478758fc7 PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net/security -PKG_DEPENDS:= libnet libpcap libpcre -PKG_BUILDDEP:= libnet libpcap pcre +PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq +PKG_BUILDDEP:= libnet libpcap pcre libtirpc daq PKG_URL:= http://www.snort.org/ -PKG_SITES:= http://dl.snort.org/snort-current/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_NOPARALLEL:= 1 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-flexresp \ - --with-libnet-includes="${STAGING_TARGET_DIR}/usr/include" \ - --with-libnet-libraries="${STAGING_TARGET_DIR}/usr/lib" \ +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_LDFLAGS+= -ltirpc +CONFIGURE_ARGS+= --disable-static-daq \ --with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-libpcap-libraries="${STAGING_TARGET_DIR}/usr/lib" \ --with-libpcre-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-libpcre-libraries="${STAGING_TARGET_DIR}/usr/lib" \ - --without-mysql \ - --without-postgresql \ - --disable-inline + --with-dnet-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-dnet-libraries="${STAGING_TARGET_DIR}/usr/lib" post-install: ${INSTALL_DIR} ${IDIR_SNORT}/usr/bin @@ -40,8 +39,6 @@ post-install: ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/reference.config \ ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map \ - ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf \ ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map \ diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure index 2f5bfde4e..3b197b010 100644 --- a/package/snort/patches/patch-configure +++ b/package/snort/patches/patch-configure @@ -1,25 +1,20 @@ ---- snort-2.8.5.2.orig/configure 2009-10-19 23:18:06.000000000 +0200 -+++ snort-2.8.5.2/configure 2010-01-14 20:16:49.000000000 +0100 -@@ -25882,81 +25882,7 @@ _ACEOF +--- snort-2.9.5.orig/configure 2013-06-04 23:21:55.000000000 +0200 ++++ snort-2.9.5/configure 2013-07-17 11:07:20.000000000 +0200 +@@ -14205,50 +14205,6 @@ _ACEOF fi -# In case INADDR_NONE is not defined (like on Solaris) -have_inaddr_none="no" --{ echo "$as_me:$LINENO: checking for INADDR_NONE" >&5 --echo $ECHO_N "checking for INADDR_NONE... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5 +-$as_echo_n "checking for INADDR_NONE... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } -else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/types.h> @@ -37,58 +32,108 @@ - return 0; -} -_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then +-if ac_fn_c_try_run "$LINENO"; then : - have_inaddr_none="yes" -else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --have_inaddr_none="no" +- have_inaddr_none="no" -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -- --{ echo "$as_me:$LINENO: result: $have_inaddr_none" >&5 --echo "${ECHO_T}$have_inaddr_none" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5 +-$as_echo "$have_inaddr_none" >&6; } -if test "x$have_inaddr_none" = "xno"; then - --cat >>confdefs.h <<\_ACEOF --#define INADDR_NONE -1 +-$as_echo "#define INADDR_NONE -1" >>confdefs.h +- +-fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14578,45 +14534,6 @@ if test "x$LPCAP" = "xno"; then + fi + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lex_destroy" >&5 +-$as_echo_n "checking for pcap_lex_destroy... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <pcap.h> +- +-int +-main () +-{ +- +- pcap_lex_destroy(); +- +- ; +- return 0; +-} -_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- have_pcap_lex_destroy="yes" +-else +- have_pcap_lex_destroy="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pcap_lex_destroy" >&5 +-$as_echo "$have_pcap_lex_destroy" >&6; } +-if test "x$have_pcap_lex_destroy" = "xyes"; then +- +-$as_echo "#define HAVE_PCAP_LEX_DESTROY 1" >>confdefs.h +- +-fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lib_version" >&5 + $as_echo_n "checking for pcap_lib_version... " >&6; } +@@ -15432,38 +15349,7 @@ fi + done + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for daq address space ID" >&5 +-$as_echo_n "checking for daq address space ID... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <daq.h> - +-int +-main () +-{ +- +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- have_daq_address_space_id="yes" +-else +- have_daq_address_space_id="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -+have_inaddr_none="yes" ++have_daq_address_space_id="yes" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26580,7 +26506,7 @@ fi - # that versions < 0.9 do not accumulate packet statistics whereas >= 0.9 do accumulate. - # This is Linux only. The check is done after pcre because the code below uses pcre. - # It seems Phil Wood's pcap does not accumulate - 0.9x --pcap_version_check="yes" -+pcap_version_check="no" - if test "x$linux" = "xyes"; then - if test "x$pcap_version_check" = "xyes"; then - { echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_daq_address_space_id" >&5 + $as_echo "$have_daq_address_space_id" >&6; } diff --git a/package/snort/patches/patch-ltmain_sh b/package/snort/patches/patch-ltmain_sh deleted file mode 100644 index 09079e090..000000000 --- a/package/snort/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.8.5.2.orig/ltmain.sh 2007-04-05 16:20:16.000000000 +0200 -+++ snort-2.8.5.2/ltmain.sh 2011-01-17 14:42:39.000000000 +0100 -@@ -1653,7 +1653,7 @@ EOF - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/snort/patches/patch-src_Makefile_in b/package/snort/patches/patch-src_Makefile_in deleted file mode 100644 index 0a7d2bba3..000000000 --- a/package/snort/patches/patch-src_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/Makefile.in 2010-07-30 21:13:15.000000000 +0200 -@@ -181,7 +181,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_detection-plugins_Makefile_in b/package/snort/patches/patch-src_detection-plugins_Makefile_in deleted file mode 100644 index 41879362d..000000000 --- a/package/snort/patches/patch-src_detection-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/Makefile.in 2010-07-30 20:38:56.000000000 +0200 -@@ -173,7 +173,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c b/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c deleted file mode 100644 index f4462c208..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c +++ /dev/null @@ -1,26 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_ip_tos_check.c 2009-05-07 00:28:33.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_ip_tos_check.c 2010-01-19 19:58:18.000000000 +0100 -@@ -191,19 +191,19 @@ void ParseIpTos(char *data, OptTreeNode - ds_ptr->not_flag = 1; - } - -- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) -+ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) - { - ds_ptr->ip_tos = atoi(data); - } - else - { -- if(index(data,(int)'x')) -+ if(strchr(data,(int)'x')) - { -- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'x')+1), NULL, 16); -+ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'x')+1), NULL, 16); - } - else - { -- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'X')+1), NULL, 16); -+ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'X')+1), NULL, 16); - } - } - diff --git a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c deleted file mode 100644 index ff3f016da..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c +++ /dev/null @@ -1,47 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_pattern_match.c 2009-08-10 22:41:44.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_pattern_match.c 2010-01-19 19:58:58.000000000 +0100 -@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O - data++; - - /* grab everything between the starting " and the end one */ -- sptr = index(data, '"'); -+ sptr = strchr(data, '"'); - eptr = strrchr(data, '"'); - - if(sptr != NULL && eptr != NULL) -@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha - char *quote_one = NULL, *quote_two = NULL; - char *comma = NULL; - -- quote_one = index(data, '"'); -+ quote_one = strchr(data, '"'); - if (quote_one) - { -- quote_two = index(quote_one+1, '"'); -+ quote_two = strchr(quote_one+1, '"'); - while ( quote_two && quote_two[-1] == '\\' ) -- quote_two = index(quote_two+1, '"'); -+ quote_two = strchr(quote_two+1, '"'); - } - - if (quote_one && quote_two) - { -- comma = index(quote_two, ','); -+ comma = strchr(quote_two, ','); - } - else if (!quote_one) - { -- comma = index(data, ','); -+ comma = strchr(data, ','); - } - - if (comma) -@@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod - } - - /* find the start of the data */ -- start_ptr = index(rule, '"'); -+ start_ptr = strchr(rule, '"'); - - if(start_ptr != rule) - { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_replace_c b/package/snort/patches/patch-src_detection-plugins_sp_replace_c deleted file mode 100644 index e532b2ac1..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_replace_c +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_replace.c 2009-07-07 17:37:04.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_replace.c 2010-01-19 20:21:14.000000000 +0100 -@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse( - } - - /* find the start of the data */ -- start_ptr = index(rule, '"'); -+ start_ptr = strchr(rule, '"'); - - if(start_ptr == NULL) - { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c b/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c deleted file mode 100644 index c1df26aad..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c +++ /dev/null @@ -1,26 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_tcp_win_check.c 2009-05-07 00:28:39.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_tcp_win_check.c 2010-01-19 20:06:29.000000000 +0100 -@@ -196,19 +196,19 @@ void ParseTcpWin(char *data, OptTreeNode - ds_ptr->not_flag = 1; - } - -- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) -+ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) - { - win_size = atoi(data); - } - else - { -- if(index(data,(int)'x')) -+ if(strchr(data,(int)'x')) - { -- win_size = (uint16_t) strtol((index(data, (int)'x')+1), NULL, 16); -+ win_size = (uint16_t) strtol((strchr(data, (int)'x')+1), NULL, 16); - } - else - { -- win_size = (uint16_t) strtol((index(data, (int)'X')+1), NULL, 16); -+ win_size = (uint16_t) strtol((strchr(data, (int)'X')+1), NULL, 16); - } - } - diff --git a/package/snort/patches/patch-src_dynamic-examples_Makefile_in b/package/snort/patches/patch-src_dynamic-examples_Makefile_in deleted file mode 100644 index 34f1c3d65..000000000 --- a/package/snort/patches/patch-src_dynamic-examples_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/dynamic-examples/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/dynamic-examples/Makefile.in 2010-07-30 21:12:51.000000000 +0200 -@@ -148,7 +148,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_dynamic-plugins_Makefile_in b/package/snort/patches/patch-src_dynamic-plugins_Makefile_in deleted file mode 100644 index 33319192a..000000000 --- a/package/snort/patches/patch-src_dynamic-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/dynamic-plugins/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/dynamic-plugins/Makefile.in 2010-07-30 20:41:39.000000000 +0200 -@@ -167,7 +167,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_log_c b/package/snort/patches/patch-src_log_c deleted file mode 100644 index 5f59a4ed0..000000000 --- a/package/snort/patches/patch-src_log_c +++ /dev/null @@ -1,38 +0,0 @@ ---- snort-2.8.5.2.orig/src/log.c 2009-10-19 17:48:42.000000000 +0200 -+++ snort-2.8.5.2/src/log.c 2010-01-19 20:01:42.000000000 +0100 -@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet * - switch(ntohs(p->ah->ea_hdr.ar_op)) - { - case ARPOP_REQUEST: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr)); - - if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) -@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet * - p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], - p->ah->arp_tha[4], p->ah->arp_tha[5]); - } -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - - fprintf(fp, " tell %s", inet_ntoa(ip_addr)); - -@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet * - break; - - case ARPOP_REPLY: -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr)); - - /* print out the originating request if we're on a weirder -@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet * - break; - - case ARPOP_RREPLY: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s", - p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], - p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_log_text_c b/package/snort/patches/patch-src_log_text_c deleted file mode 100644 index 033608f9f..000000000 --- a/package/snort/patches/patch-src_log_text_c +++ /dev/null @@ -1,38 +0,0 @@ ---- snort-2.8.5.2.orig/src/log_text.c 2009-05-07 00:28:15.000000000 +0200 -+++ snort-2.8.5.2/src/log_text.c 2010-01-19 20:00:30.000000000 +0100 -@@ -1604,7 +1604,7 @@ void LogArpHeader(TextLog* log, Packet * - switch(ntohs(p->ah->ea_hdr.ar_op)) - { - case ARPOP_REQUEST: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - TextLog_Print(log, "ARP who-has %s", inet_ntoa(ip_addr)); - - if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) -@@ -1613,7 +1613,7 @@ void LogArpHeader(TextLog* log, Packet * - p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], - p->ah->arp_tha[4], p->ah->arp_tha[5]); - } -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - - TextLog_Print(log, " tell %s", inet_ntoa(ip_addr)); - -@@ -1626,7 +1626,7 @@ void LogArpHeader(TextLog* log, Packet * - break; - - case ARPOP_REPLY: -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - TextLog_Print(log, "ARP reply %s", inet_ntoa(ip_addr)); - - /* print out the originating request if we're on a weirder -@@ -1659,7 +1659,7 @@ void LogArpHeader(TextLog* log, Packet * - break; - - case ARPOP_RREPLY: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - TextLog_Print(log, "RARP reply %X:%X:%X:%X:%X:%X at %s", - p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], - p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_output-plugins_Makefile_in b/package/snort/patches/patch-src_output-plugins_Makefile_in deleted file mode 100644 index 1333552aa..000000000 --- a/package/snort/patches/patch-src_output-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/output-plugins/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/output-plugins/Makefile.in 2010-07-30 20:37:01.000000000 +0200 -@@ -162,7 +162,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c deleted file mode 100644 index 5b07072be..000000000 --- a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c +++ /dev/null @@ -1,28 +0,0 @@ ---- snort-2.8.5.2.orig/src/output-plugins/spo_alert_unixsock.c 2009-05-07 00:29:12.000000000 +0200 -+++ snort-2.8.5.2/src/output-plugins/spo_alert_unixsock.c 2010-01-19 20:05:44.000000000 +0100 -@@ -179,13 +179,13 @@ void AlertUnixSock(Packet *p, char *msg, - bzero((char *)&alertpkt,sizeof(alertpkt)); - if (event) - { -- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event)); -+ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event)); - } - - if(p && p->pkt) - { -- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr)); -- bcopy((const void *)p->pkt,alertpkt.pkt, -+ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr)); -+ memcpy(alertpkt.pkt,(const void *)p->pkt, - alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen); - } - else -@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg, - - if (msg) - { -- bcopy((const void *)msg,(void *)alertpkt.alertmsg, -+ memcpy((void *)alertpkt.alertmsg,(const void *)msg, - strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg)); - } - diff --git a/package/snort/patches/patch-src_parser_IpAddrSet_c b/package/snort/patches/patch-src_parser_IpAddrSet_c deleted file mode 100644 index edb62126d..000000000 --- a/package/snort/patches/patch-src_parser_IpAddrSet_c +++ /dev/null @@ -1,16 +0,0 @@ ---- snort-2.8.5.2.orig/src/parser/IpAddrSet.c 2009-07-07 17:37:07.000000000 +0200 -+++ snort-2.8.5.2/src/parser/IpAddrSet.c 2010-01-19 20:20:50.000000000 +0100 -@@ -388,11 +388,11 @@ int ParseIP(char *paddr, IpAddrSet *ias, - /* protecting against malicious DNS servers */ - if(host_info->h_length <= (int)sizeof(sin.sin_addr)) - { -- bcopy(host_info->h_addr, (char *) &sin.sin_addr, host_info->h_length); -+ memcpy((char *) &sin.sin_addr, host_info->h_addr, host_info->h_length); - } - else - { -- bcopy(host_info->h_addr, (char *) &sin.sin_addr, sizeof(sin.sin_addr)); -+ memcpy((char *) &sin.sin_addr, host_info->h_addr, sizeof(sin.sin_addr)); - } - } - /* Using h_errno */ diff --git a/package/snort/patches/patch-src_parser_Makefile_in b/package/snort/patches/patch-src_parser_Makefile_in deleted file mode 100644 index 759f00c7f..000000000 --- a/package/snort/patches/patch-src_parser_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/parser/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/parser/Makefile.in 2010-07-30 21:10:25.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in deleted file mode 100644 index 5129950f3..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in 2010-07-30 20:53:23.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in deleted file mode 100644 index 8ac2134d6..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/client/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/client/Makefile.in 2010-07-30 20:59:11.000000000 +0200 -@@ -156,7 +156,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in deleted file mode 100644 index 3726d6c6f..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/event_output/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/event_output/Makefile.in 2010-07-30 20:56:45.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in deleted file mode 100644 index cadcd41c0..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/mode_inspection/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/mode_inspection/Makefile.in 2010-07-30 20:49:58.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in deleted file mode 100644 index 932899608..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/normalization/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/normalization/Makefile.in 2010-07-30 21:01:32.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in deleted file mode 100644 index a299ae945..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/server/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/server/Makefile.in 2010-07-30 20:58:00.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in deleted file mode 100644 index decc25e2a..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/session_inspection/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/session_inspection/Makefile.in 2010-07-30 20:44:26.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_Makefile_in b/package/snort/patches/patch-src_preprocessors_Makefile_in deleted file mode 100644 index 1dabe1e71..000000000 --- a/package/snort/patches/patch-src_preprocessors_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/Makefile.in 2010-07-30 21:07:39.000000000 +0200 -@@ -173,7 +173,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in b/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in deleted file mode 100644 index a6a5a4fc1..000000000 --- a/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/Stream5/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/Stream5/Makefile.in 2010-07-30 21:04:38.000000000 +0200 -@@ -158,7 +158,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_sfutil_Makefile_in b/package/snort/patches/patch-src_sfutil_Makefile_in deleted file mode 100644 index b8b536bf2..000000000 --- a/package/snort/patches/patch-src_sfutil_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/sfutil/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/sfutil/Makefile.in 2010-07-30 20:34:40.000000000 +0200 -@@ -166,7 +166,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c new file mode 100644 index 000000000..4279b4a72 --- /dev/null +++ b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c @@ -0,0 +1,95 @@ +--- snort-2.9.5.orig/src/target-based/sf_attribute_table_parser.c 2013-06-04 23:23:12.000000000 +0200 ++++ snort-2.9.5/src/target-based/sf_attribute_table_parser.c 2013-07-17 11:10:59.000000000 +0200 +@@ -73,7 +73,6 @@ typedef int flex_int32_t; + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; +-#endif /* ! C99 */ + + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -104,6 +103,8 @@ typedef unsigned int flex_uint32_t; + #define UINT32_MAX (4294967295U) + #endif + ++#endif /* ! C99 */ ++ + #endif /* ! FLEXINT_H */ + + #ifdef __cplusplus +@@ -160,7 +161,15 @@ typedef unsigned int flex_uint32_t; + + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k. ++ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. ++ * Ditto for the __ia64__ case accordingly. ++ */ ++#define YY_BUF_SIZE 32768 ++#else + #define YY_BUF_SIZE 16384 ++#endif /* __ia64__ */ + #endif + + /* The state buf must be large enough to hold one state per character in the main buffer. +@@ -6264,7 +6273,7 @@ int sfat_parse(void); + /* Rules Section. + * All rules are in here prior to second "%%" seperator + */ +-#line 6268 "sf_attribute_table_parser.c" ++#line 6277 "sf_attribute_table_parser.c" + + #define INITIAL 0 + #define waiting_for_comma_prior_to_data 1 +@@ -6345,7 +6354,12 @@ static int input (void ); + + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k */ ++#define YY_READ_BUF_SIZE 16384 ++#else + #define YY_READ_BUF_SIZE 8192 ++#endif /* __ia64__ */ + #endif + + /* Copy whatever the last rule matched to the standard output. */ +@@ -6364,7 +6378,7 @@ static int input (void ); + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ +- unsigned n; \ ++ size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( sfatin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ +@@ -6448,7 +6462,7 @@ YY_DECL + + #line 100 "sf_attribute_table_parser.l" + +-#line 6452 "sf_attribute_table_parser.c" ++#line 6466 "sf_attribute_table_parser.c" + + if ( !(yy_init) ) + { +@@ -6842,7 +6856,7 @@ YY_RULE_SETUP + #line 186 "sf_attribute_table_parser.l" + ECHO; + YY_BREAK +-#line 6846 "sf_attribute_table_parser.c" ++#line 6860 "sf_attribute_table_parser.c" + + case YY_END_OF_BUFFER: + { +@@ -7558,8 +7572,8 @@ YY_BUFFER_STATE sfat_scan_string (yycons + + /** Setup the input buffer state to scan the given bytes. The next call to sfatlex() will + * scan from a @e copy of @a bytes. +- * @param bytes the byte buffer to scan +- * @param len the number of bytes in the buffer pointed to by @a bytes. ++ * @param yybytes the byte buffer to scan ++ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ diff --git a/package/snort/patches/patch-tools_u2boat_Makefile_in b/package/snort/patches/patch-tools_u2boat_Makefile_in new file mode 100644 index 000000000..495fab6c8 --- /dev/null +++ b/package/snort/patches/patch-tools_u2boat_Makefile_in @@ -0,0 +1,11 @@ +--- snort-2.9.5.orig/tools/u2boat/Makefile.in 2013-06-04 23:21:53.000000000 +0200 ++++ snort-2.9.5/tools/u2boat/Makefile.in 2013-07-17 11:21:52.000000000 +0200 +@@ -256,7 +256,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + u2boat_SOURCES = u2boat.c u2boat.h +-u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) ++#u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) + u2boat_LDADD = -lpcap + dist_doc_DATA = README.u2boat + all: all-am diff --git a/package/snort/patches/patch-tools_u2spewfoo_Makefile_in b/package/snort/patches/patch-tools_u2spewfoo_Makefile_in new file mode 100644 index 000000000..a8f36785d --- /dev/null +++ b/package/snort/patches/patch-tools_u2spewfoo_Makefile_in @@ -0,0 +1,11 @@ +--- snort-2.9.5.orig/tools/u2spewfoo/Makefile.in 2013-06-04 23:21:54.000000000 +0200 ++++ snort-2.9.5/tools/u2spewfoo/Makefile.in 2013-07-17 11:24:18.000000000 +0200 +@@ -226,7 +226,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + u2spewfoo_SOURCES = u2spewfoo.c +-u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) ++#u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) + EXTRA_DIST = \ + u2spewfoo.dsp + diff --git a/package/squid/Makefile b/package/squid/Makefile index 50751442f..f2f906a50 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -85,7 +85,7 @@ $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth- $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,${PKG_NAME}-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,${PKG_NAME}-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,${PKG_NAME}-mod-external-acl-file-userip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,${PKG_NAME}-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -93,11 +93,11 @@ $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,basic_getpwnam_auth $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,basic_ldap_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,basic_ncsa_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,basic_smb_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_pw_file)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,file_userip)) +$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_file_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,ext_file_userip_acl)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,fake_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth)) TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ diff --git a/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test b/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test new file mode 100644 index 000000000..7bcdcb33b --- /dev/null +++ b/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test @@ -0,0 +1,12 @@ +--- squid-3.2.3.orig/helpers/basic_auth/LDAP/config.test 2012-10-20 14:39:49.000000000 +0200 ++++ squid-3.2.3/helpers/basic_auth/LDAP/config.test 2013-07-18 11:45:46.000000000 +0200 +@@ -1,8 +1,2 @@ + #!/bin/sh +-if [ -f /usr/include/ldap.h ]; then +- exit 0 +-fi +-if [ -f /usr/include/winldap.h ]; then +- exit 0 +-fi +-exit 1 ++exit 0 diff --git a/package/squid/patches/patch-helpers_external_acl_file_userip_config_test b/package/squid/patches/patch-helpers_external_acl_file_userip_config_test new file mode 100644 index 000000000..6b9d5aaa3 --- /dev/null +++ b/package/squid/patches/patch-helpers_external_acl_file_userip_config_test @@ -0,0 +1,9 @@ +--- squid-3.2.3.orig/helpers/external_acl/file_userip/config.test 2012-10-20 14:39:49.000000000 +0200 ++++ squid-3.2.3/helpers/external_acl/file_userip/config.test 2013-07-18 11:50:54.000000000 +0200 +@@ -1,5 +1,2 @@ + #!/bin/sh +-if [ -f /usr/include/sys/socket.h ]; then +- exit 0 +-fi +-exit 1 ++exit 0 diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in index f9b01dcb6..64ae13836 100644 --- a/package/squid/patches/patch-src_Makefile_in +++ b/package/squid/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- squid-3.1.16.orig/src/Makefile.in 2011-10-13 10:35:44.000000000 +0200 -+++ squid-3.1.16/src/Makefile.in 2011-11-10 14:36:55.421109832 +0100 -@@ -4815,7 +4815,7 @@ cache_cf.o: cf_parser.cci +--- squid-3.2.3.orig/src/Makefile.in 2012-10-20 14:40:18.000000000 +0200 ++++ squid-3.2.3/src/Makefile.in 2013-07-18 11:37:59.000000000 +0200 +@@ -6573,7 +6573,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) diff --git a/package/tor/Makefile b/package/tor/Makefile index 865ecaa51..cc0e98bbe 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tor -PKG_VERSION:= 0.2.2.39 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 9157a1f02fcda9d7d2c5744176373abd +PKG_VERSION:= 0.2.3.25 +PKG_RELEASE:= 2 +PKG_MD5SUM:= a1c364189a9a66ed9daa8e6436489daf PKG_DESCR:= An anonymous Internet communication system PKG_SECTION:= proxy PKG_DEPENDS:= libevent libopenssl zlib libpthread diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index 58a8d4759..8282aa65d 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -11,12 +11,12 @@ autostart) ;; start) [ -d /var/run/tor ] || mkdir -p /var/run/tor - [ -d /tmp/.tor ] || mkdir -p /tmp/.tor - chown tor:tor /tmp/.tor /var/run/tor - su - tor -c /usr/bin/tor + [ -d /etc/tor ] || mkdir -p /etc/tor + chown tor:tor /etc/tor /var/run/tor + /usr/bin/tor ;; stop) - kill $(pgrep -f /usr/bin/tor) + kill -15 $(pgrep -f /usr/bin/tor) ;; restart) sh $0 stop diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst index b3bb981a1..7a374861b 100644 --- a/package/tor/files/tor.postinst +++ b/package/tor/files/tor.postinst @@ -3,4 +3,4 @@ add_rcconf tor tor NO gid=$(get_next_gid) add_group tor $gid -add_user tor $(get_next_uid) $gid /tmp/.tor +add_user tor $(get_next_uid) $gid /etc/tor diff --git a/package/tor/files/torrc b/package/tor/files/torrc index b533ce04c..e29fc1c50 100644 --- a/package/tor/files/torrc +++ b/package/tor/files/torrc @@ -51,7 +51,7 @@ RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. -#DataDirectory /var/lib/tor +DataDirectory /etc/tor ## The port on which Tor will listen for local connections from Tor controller ## applications, as documented in control-spec.txt. NB: this feature is @@ -124,3 +124,4 @@ RunAsDaemon 1 #ExitPolicy reject *:* # middleman only -- no exits allowed PidFile /var/run/tor/tor.pid +User tor diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile index 9d316b307..b00f72b81 100644 --- a/package/xf86-video-ati/Makefile +++ b/package/xf86-video-ati/Makefile @@ -14,7 +14,7 @@ PKG_DEPENDS:= xorg-server libdrm mesalib udev PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !avr32 +PKG_ARCH_DEPENDS:= !avr32 !arm PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA include $(TOPDIR)/mk/package.mk |