From 2ea9b0d3dfda3a881c87afc00727ef7dc7de93da Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 23 Oct 2012 11:27:09 +0200
Subject: update to latest squid upstream

---
 package/squid/patches/patch-include_squid_endian_h | 15 -----------
 package/squid/patches/patch-include_squid_types_h  | 31 ----------------------
 package/squid/patches/patch-lib_util_c             | 11 --------
 3 files changed, 57 deletions(-)
 delete mode 100644 package/squid/patches/patch-include_squid_endian_h
 delete mode 100644 package/squid/patches/patch-include_squid_types_h
 delete mode 100644 package/squid/patches/patch-lib_util_c

(limited to 'package/squid/patches')

diff --git a/package/squid/patches/patch-include_squid_endian_h b/package/squid/patches/patch-include_squid_endian_h
deleted file mode 100644
index b89b1121c..000000000
--- a/package/squid/patches/patch-include_squid_endian_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 */
diff --git a/package/squid/patches/patch-include_squid_types_h b/package/squid/patches/patch-include_squid_types_h
deleted file mode 100644
index ae6bd3de3..000000000
--- a/package/squid/patches/patch-include_squid_types_h
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c
deleted file mode 100644
index b50c4afb2..000000000
--- a/package/squid/patches/patch-lib_util_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- squid-3.1.4.orig/lib/util.c	2010-05-30 15:21:11.000000000 +0200
-+++ squid-3.1.4/lib/util.c	2011-02-14 20:44:04.000000000 +0100
-@@ -56,7 +56,7 @@
- #if HAVE_GNUMALLLOC_H
- #include <gnumalloc.h>
- #elif HAVE_MALLOC_H
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #if HAVE_ERRNO_H
- #include <errno.h>
-- 
cgit v1.2.3