squid: initial import from old-packages

Signed-off-by: Luka Perkov <luka@openwrt.org>

2 files changed, 78 insertions, 0 deletions

diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch
new file mode 100644
index 000000000..c30f0346f
--- /dev/null
+++ b/net/squid/patches/001-cross_compile.patch
@@ -0,0 +1,49 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -7742,7 +7742,7 @@ cache_cf.o: cf_parser.cci
+ 
+ # cf_gen builds the configuration files.
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
+-	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci
+--- a/configure
++++ b/configure
+@@ -22223,7 +22223,7 @@ $as_echo_n "checking whether the SSL_get
+   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
++_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
+@@ -22271,7 +22271,7 @@ $as_echo_n "checking whether the workaro
+   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
++_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
+@@ -24921,7 +24921,7 @@ else
+     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
++_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
+@@ -24946,7 +24946,7 @@ else
+     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
++_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
diff --git a/net/squid/patches/100-mime.patch b/net/squid/patches/100-mime.patch
new file mode 100644
index 000000000..72915ae8f
--- /dev/null
+++ b/net/squid/patches/100-mime.patch
@@ -0,0 +1,29 @@
+--- a/src/mime.conf.default
++++ b/src/mime.conf.default
+@@ -1,19 +1,3 @@
+-# This file associates filename extensions (for servers or services
+-# that don't automatically include them - like ftp) with a mime type
+-# and a graphical icon.
+-#
+-#
+-# This file has the format :
+-# regex content-type icon content-encoding transfer-mode
+-#-----------------------------------------------------------------------------------
+-#
+-#
+-# Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1)
+-#
+-#
+-#
+-# regexp	content-type			icon				encoding mode	actions
+-#--------------------------------------------------------------------------------------------------------
+ \.gif$			image/gif		silk/image.png			-	image	+download
+ \.mime$			www/mime		silk/page_white_text.png	-	ascii	+download
+ ^internal-dirup$	-			silk/arrow_up.png		-	-
+@@ -190,6 +174,4 @@
+ \.xml$		text/xml			silk/page_world.png		-	ascii	+download
+ \.xsl$		text/xml			silk/layout.png			-	ascii	+download
+ \.xyz$		chemical/x-xyz			silk/chart_line.png		-	image	+download
+-
+-# the default
+ .		text/plain			silk/bullet_red.png		-	image	+download +view