From 281528655c7c918963a894707cff67c742d7a999 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Jul 2010 16:18:35 +0200 Subject: fix cross-compile on FreeBSD host --- package/squid/Makefile | 4 ++- package/squid/patches/patch-include_squid_endian_h | 15 +++++++++++ package/squid/patches/patch-include_squid_types_h | 31 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 package/squid/patches/patch-include_squid_endian_h create mode 100644 package/squid/patches/patch-include_squid_types_h diff --git a/package/squid/Makefile b/package/squid/Makefile index 624260b13..34cb65e0b 100644 --- a/package/squid/Makefile +++ b/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/ diff --git a/package/squid/patches/patch-include_squid_endian_h b/package/squid/patches/patch-include_squid_endian_h new file mode 100644 index 000000000..b89b1121c --- /dev/null +++ b/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 . + */ ++#include ++#if !defined(BSD) + #if HAVE_BYTESWAP_H + # include + #endif /* HAVE_BYTESWAP_H */ ++#endif + #ifdef HAVE_MACHINE_BYTE_SWAP_H + # include + #endif /* HAVE_MACHINE_BYTE_SWAP_H */ 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..ae6bd3de3 --- /dev/null +++ b/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 + /* This should be in synch with what we have in acinclude.m4 */ + #if HAVE_SYS_TYPES_H + #include + #endif ++#if !defined(BSD) + #if HAVE_LINUX_TYPES_H + #include + #endif ++#endif + #if STDC_HEADERS + #include + #include +@@ -70,9 +73,11 @@ + #if HAVE_INTTYPES_H + #include + #endif ++#if !defined(BSD) + #if HAVE_SYS_BITYPES_H + #include + #endif ++#endif + #if HAVE_SYS_SELECT_H + #include + #endif -- cgit v1.2.3 From 34e0ded71b3c60adb0f6a145537a94db1886196b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Jul 2010 16:19:34 +0200 Subject: fix cross-compile on FreeBSD host --- package/snort/patches/patch-src_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_detection-plugins_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_dynamic-examples_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_dynamic-plugins_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_output-plugins_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_parser_Makefile_in | 10 ++++++++++ ...src_preprocessors_HttpInspect_anomaly_detection_Makefile_in | 10 ++++++++++ .../patch-src_preprocessors_HttpInspect_client_Makefile_in | 10 ++++++++++ ...atch-src_preprocessors_HttpInspect_event_output_Makefile_in | 10 ++++++++++ ...h-src_preprocessors_HttpInspect_mode_inspection_Makefile_in | 10 ++++++++++ ...tch-src_preprocessors_HttpInspect_normalization_Makefile_in | 10 ++++++++++ .../patch-src_preprocessors_HttpInspect_server_Makefile_in | 10 ++++++++++ ...rc_preprocessors_HttpInspect_session_inspection_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_preprocessors_Makefile_in | 10 ++++++++++ .../snort/patches/patch-src_preprocessors_Stream5_Makefile_in | 10 ++++++++++ package/snort/patches/patch-src_sfutil_Makefile_in | 10 ++++++++++ 16 files changed, 160 insertions(+) create mode 100644 package/snort/patches/patch-src_Makefile_in create mode 100644 package/snort/patches/patch-src_detection-plugins_Makefile_in create mode 100644 package/snort/patches/patch-src_dynamic-examples_Makefile_in create mode 100644 package/snort/patches/patch-src_dynamic-plugins_Makefile_in create mode 100644 package/snort/patches/patch-src_output-plugins_Makefile_in create mode 100644 package/snort/patches/patch-src_parser_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_Makefile_in create mode 100644 package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in create mode 100644 package/snort/patches/patch-src_sfutil_Makefile_in diff --git a/package/snort/patches/patch-src_Makefile_in b/package/snort/patches/patch-src_Makefile_in new file mode 100644 index 000000000..0a7d2bba3 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_detection-plugins_Makefile_in b/package/snort/patches/patch-src_detection-plugins_Makefile_in new file mode 100644 index 000000000..41879362d --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_dynamic-examples_Makefile_in b/package/snort/patches/patch-src_dynamic-examples_Makefile_in new file mode 100644 index 000000000..34f1c3d65 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_dynamic-plugins_Makefile_in b/package/snort/patches/patch-src_dynamic-plugins_Makefile_in new file mode 100644 index 000000000..33319192a --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_output-plugins_Makefile_in b/package/snort/patches/patch-src_output-plugins_Makefile_in new file mode 100644 index 000000000..1333552aa --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_parser_Makefile_in b/package/snort/patches/patch-src_parser_Makefile_in new file mode 100644 index 000000000..759f00c7f --- /dev/null +++ b/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@ 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 new file mode 100644 index 000000000..5129950f3 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in new file mode 100644 index 000000000..8ac2134d6 --- /dev/null +++ b/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@ 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 new file mode 100644 index 000000000..3726d6c6f --- /dev/null +++ b/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@ 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 new file mode 100644 index 000000000..cadcd41c0 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in new file mode 100644 index 000000000..932899608 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in new file mode 100644 index 000000000..a299ae945 --- /dev/null +++ b/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@ 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 new file mode 100644 index 000000000..decc25e2a --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_preprocessors_Makefile_in b/package/snort/patches/patch-src_preprocessors_Makefile_in new file mode 100644 index 000000000..1dabe1e71 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in b/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in new file mode 100644 index 000000000..a6a5a4fc1 --- /dev/null +++ b/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@ diff --git a/package/snort/patches/patch-src_sfutil_Makefile_in b/package/snort/patches/patch-src_sfutil_Makefile_in new file mode 100644 index 000000000..b8b536bf2 --- /dev/null +++ b/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@ -- cgit v1.2.3