cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

squid: update to 3.5.2

Browse Source 
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
This commit is contained in:
Marko Ratkaj
2015-03-06 16:52:50 +01:00
committed by Luka Perkov
parent 0e6069854f
commit c05980909c
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/squid/patches/001-cross_compile.patch
+6 -6
View File
@@ -1,17 +1,17 @@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7742,7 +7742,7 @@ cache_cf.o: cf_parser.cci
@@ -7759,7 +7759,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
- $(BUILDCXX) $(BUILDCXXFLAGS) -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
@@ -22226,7 +22226,7 @@ $as_echo_n "checking whether the SSL_get
@@ -22935,7 +22935,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;}
@@ -20,7 +20,7 @@
See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22274,7 +22274,7 @@ $as_echo_n "checking whether the workaro
@@ -22983,7 +22983,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;}
@@ -29,7 +29,7 @@
See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24924,7 +24924,7 @@ else
@@ -28201,7 +28201,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;}
@@ -38,7 +38,7 @@
See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24949,7 +24949,7 @@ else
@@ -28226,7 +28226,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;}
net/squid/patches/100-mime.patch
+13 -12
View File
@@ -1,29 +1,30 @@
--- 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
@@ -1,20 +1,3 @@
-## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-#
-# This file associates URL patterns for servers or services
-# that don't automatically include Content-Type (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)
-#
-#
-# This file has the format :
-#
-# 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 @@ README text/plain silk/information.pn
@@ -191,6 +174,4 @@ README text/plain silk/information.pn
\.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