diff options
| author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-06-08 10:02:40 -0300 |
|---|---|---|
| committer | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-06-08 10:03:24 -0300 |
| commit | 90f4b935bde21432b5763a5b03e356a9cdc124ee (patch) | |
| tree | 44996e8a4ddfd8002de5bd43f32558bb3a2fc4ba /net/squid/patches | |
| parent | dec7628ea9e8d99bb8ea0cecfb5b9732b43bcfc5 (diff) | |
squid: incorporated ideas from PR#5196
Incorporated @ratkaj configuration options and patches.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Diffstat (limited to 'net/squid/patches')
| -rw-r--r-- | net/squid/patches/001-cross_compile.patch | 39 | ||||
| -rw-r--r-- | net/squid/patches/002-glibc-compile.patch | 12 |
2 files changed, 28 insertions, 23 deletions
diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch index 849fce82e..0eb83e602 100644 --- a/net/squid/patches/001-cross_compile.patch +++ b/net/squid/patches/001-cross_compile.patch @@ -1,31 +1,24 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -7642,7 +7642,7 @@ cache_cf.o: cf_parser.cci +From fac6f63a52a2f4cbb3748cd5687eca5409093904 Mon Sep 17 00:00:00 2001 +From: Marko Ratkaj <marko.ratkaj@sartura.hr> +Date: Thu, 20 Apr 2017 15:15:50 +0200 +Subject: [PATCH] foo + +Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr> +--- + src/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: squid-4.0.21/src/Makefile.in +=================================================================== +--- squid-4.0.21.orig/src/Makefile.in ++++ squid-4.0.21/src/Makefile.in +@@ -7642,7 +7642,8 @@ 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 - $(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 -@@ -30695,7 +30695,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 -@@ -30720,7 +30720,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/002-glibc-compile.patch b/net/squid/patches/002-glibc-compile.patch new file mode 100644 index 000000000..d930bdf34 --- /dev/null +++ b/net/squid/patches/002-glibc-compile.patch @@ -0,0 +1,12 @@ +--- squid-4.0.21.orig/src/tools.cc ++++ squid-4.0.21/src/tools.cc +@@ -581,7 +581,8 @@ + } + #else + +- setuid(0); ++ if (setuid(0) < 0) ++ debugs(50, 1, "no_suid: setuid (0)"); + #endif + #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) + /* Set Linux DUMPABLE flag */ |