Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/snort/patches/patch-src_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_detection-plugins_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_dynamic-examples_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_dynamic-plugins_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_output-plugins_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_parser_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/snort/patches/patch-src_sfutil_Makefile_in

@@ -0,0 +1,10 @@
+--- 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@

package/squid/Makefile

@@ -100,6 +100,7 @@ CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_lib_nsl_main=no \
 			ac_cv_func_strnstr=no \
 			squid_cv_pf_inet6=yes
+XAKE_FLAGS+=		MKDIR_P="mkdir -p"
 CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--libexecdir=/usr/lib/squid \
 			--sysconfdir=/etc/squid \
@@ -147,7 +148,8 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 		${IDIR_SQUID}/etc/squid/
 	${INSTALL_DATA} ./files/squid.conf ${IDIR_SQUID}/etc/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid/errors
-	${CP} ${WRKINST}/usr/share/squid/errors/en ${IDIR_SQUID}/usr/share/squid/errors
+	${CP} ${WRKINST}/usr/share/squid/errors/en \
+		${IDIR_SQUID}/usr/share/squid/errors
 	${CP} ${WRKINST}/usr/share/squid/icons ${IDIR_SQUID}/usr/share/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin ${IDIR_SQUID}/usr/lib/squid
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/

package/squid/patches/patch-include_squid_endian_h

@@ -0,0 +1,15 @@
+--- squid-3.1.4.orig/include/squid_endian.h	2010-05-30 15:21:11.000000000 +0200
++++ squid-3.1.4/include/squid_endian.h	2010-07-31 14:29:02.000000000 +0200
+@@ -65,9 +65,12 @@
+  *
+  * Some systems define htobe16()/be16toh() and friends in <sys/endian.h>.
+  */
++#include <sys/param.h>
++#if !defined(BSD)
+ #if HAVE_BYTESWAP_H
+ #  include <byteswap.h>
+ #endif /* HAVE_BYTESWAP_H */
++#endif
+ #ifdef HAVE_MACHINE_BYTE_SWAP_H
+ #  include <machine/byte_swap.h>
+ #endif	/* HAVE_MACHINE_BYTE_SWAP_H */

package/squid/patches/patch-include_squid_types_h

@@ -0,0 +1,31 @@
+--- squid-3.1.4.orig/include/squid_types.h	2010-05-30 15:21:12.000000000 +0200
++++ squid-3.1.4/include/squid_types.h	2010-07-31 14:28:05.000000000 +0200
+@@ -56,13 +56,16 @@
+ #ifndef SQUID_TYPES_H
+ #define SQUID_TYPES_H
+ 
++#include <sys/param.h>
+ /* This should be in synch with what we have in acinclude.m4 */
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#if !defined(BSD)
+ #if HAVE_LINUX_TYPES_H
+ #include <linux/types.h>
+ #endif
++#endif
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+@@ -70,9 +73,11 @@
+ #if HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
++#if !defined(BSD)
+ #if HAVE_SYS_BITYPES_H
+ #include <sys/bitypes.h>
+ #endif
++#endif
+ #if HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif