summaryrefslogtreecommitdiff
path: root/package/squid/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-12 00:43:43 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-12 00:43:43 +0100
commit965bf8becf63a12169cd964973e3a56fd96e21fe (patch)
tree5c9459da5196712c9153304804a1b44510b6e00b /package/squid/patches
parent070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (diff)
a bunch of FreeBSD compatibility patches
Diffstat (limited to 'package/squid/patches')
-rw-r--r--package/squid/patches/patch-include_squid_types_h26
-rw-r--r--package/squid/patches/patch-src_HttpHeaderTools_cc6
-rw-r--r--package/squid/patches/patch-src_Makefile_am6
3 files changed, 32 insertions, 6 deletions
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