diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:40:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:40:21 +0100 |
| commit | 5955ec0ef03f718aa9b1043eb67a169f219c84c5 (patch) | |
| tree | cd3d5db46c3602b3ed973c7477c463b309f1658d /package/squid/files | |
| parent | 5ccd702213c5b129ba3f113d2bb256111639ea45 (diff) | |
update to latest upstream version
Diffstat (limited to 'package/squid/files')
| -rw-r--r-- | package/squid/files/autotool.patch | 37 | ||||
| -rw-r--r-- | package/squid/files/squid.conf | 4 |
2 files changed, 1 insertions, 40 deletions
diff --git a/package/squid/files/autotool.patch b/package/squid/files/autotool.patch deleted file mode 100644 index 151e22879..000000000 --- a/package/squid/files/autotool.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nur squid-3.1.11.orig/configure.ac squid-3.1.11/configure.ac ---- squid-3.1.11.orig/configure.ac 2011-02-08 05:07:06.000000000 +0100 -+++ squid-3.1.11/configure.ac 2011-03-04 23:03:25.000000000 +0100 -@@ -3913,6 +3913,9 @@ - fi - AC_SUBST(XTRA_LIBS) - -+CXX_FOR_BUILD="g++" -+AC_SUBST(CXX_FOR_BUILD) -+ - dnl Clean up after OSF/1 core dump bug - rm -f core - -diff -Nur squid-3.1.11.orig/src/Makefile.am squid-3.1.11/src/Makefile.am ---- squid-3.1.11.orig/src/Makefile.am 2011-02-08 05:05:51.000000000 +0100 -+++ squid-3.1.11/src/Makefile.am 2011-03-04 23:16:39.000000000 +0100 -@@ -732,6 +732,8 @@ - # Make location configure settings available to the code - DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\" - -+CXX_FOR_BUILD ?= @CXX_FOR_BUILD@ -+ - snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h - - globals.cc: globals.h mk-globals-c.pl -@@ -753,6 +755,11 @@ - squid.conf.default squid.conf.documented: cf_parser.cci - true - -+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) -+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \ -+ $(top_srcdir)/lib/util.c $(top_srcdir)/compat/assert.cc \ -+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ${CXXFLAGS_FOR_BUILD} -+ - cf_parser.cci: cf.data cf_gen$(EXEEXT) - ./cf_gen cf.data $(srcdir)/cf.data.depend - diff --git a/package/squid/files/squid.conf b/package/squid/files/squid.conf index f6539b791..78ab2978a 100644 --- a/package/squid/files/squid.conf +++ b/package/squid/files/squid.conf @@ -1,4 +1,4 @@ -visible_hostname linux +visible_hostname openadk # for transparent proxy use following # http_port 3128 transparent http_port 3128 @@ -10,7 +10,5 @@ cache_log /var/log/squid-cache.log # security cache_effective_user squid cache_effective_group squid -# cache dir -cache_dir ufs /var/squid/cache 10M 16 256 # allow all http_access allow all |