c3f10526dc
update to 3.4.9, fix for bnc#891268 (CVE-2014-7141, CVE-2014-7142) OBS-URL: https://build.opensuse.org/request/show/263262 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=61
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
Index: src/Makefile.am
|
|
===================================================================
|
|
--- src/Makefile.am.orig
|
|
+++ src/Makefile.am
|
|
@@ -983,7 +983,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
|
|
+ $(HOSTCXX) $(CXXFLAGS) -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
|
|
Index: src/Makefile.in
|
|
===================================================================
|
|
--- src/Makefile.in.orig
|
|
+++ 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
|
|
+ $(HOSTCXX) $(CXXFLAGS) -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
|