diff --git a/squid-3.4.2-brokenad.patch b/squid-brokenad.patch similarity index 89% rename from squid-3.4.2-brokenad.patch rename to squid-brokenad.patch index c3b0105..b5f5712 100644 --- a/squid-3.4.2-brokenad.patch +++ b/squid-brokenad.patch @@ -1,7 +1,7 @@ Index: helpers/external_acl/kerberos_ldap_group/support_krb5.cc =================================================================== ---- helpers/external_acl/kerberos_ldap_group/support_krb5.cc.orig 2013-12-30 12:33:27.000000000 +0100 -+++ helpers/external_acl/kerberos_ldap_group/support_krb5.cc 2014-03-15 00:41:12.581050607 +0100 +--- helpers/external_acl/kerberos_ldap_group/support_krb5.cc.orig ++++ helpers/external_acl/kerberos_ldap_group/support_krb5.cc @@ -52,7 +52,7 @@ krb5_cleanup() * create Kerberos memory cache */ @@ -33,8 +33,8 @@ Index: helpers/external_acl/kerberos_ldap_group/support_krb5.cc #if defined(HAVE_HEIMDAL_KERBEROS) || ( defined(HAVE_KRB5_KT_FREE_ENTRY) && HAVE_DECL_KRB5_KT_FREE_ENTRY==1) Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc =================================================================== ---- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc.orig 2013-12-30 12:33:27.000000000 +0100 -+++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc 2014-03-15 00:39:14.653271451 +0100 +--- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc.orig ++++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc @@ -57,6 +57,7 @@ init_args(struct main_args *margs) margs->rc_allow = 0; margs->AD = 0; @@ -72,8 +72,8 @@ Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc fprintf(stderr, "-h help\n"); Index: helpers/external_acl/kerberos_ldap_group/support.h =================================================================== ---- helpers/external_acl/kerberos_ldap_group/support.h.orig 2013-12-30 12:33:27.000000000 +0100 -+++ helpers/external_acl/kerberos_ldap_group/support.h 2014-03-15 00:08:50.918686771 +0100 +--- helpers/external_acl/kerberos_ldap_group/support.h.orig ++++ helpers/external_acl/kerberos_ldap_group/support.h @@ -97,6 +97,7 @@ struct main_args { int rc_allow; int AD; @@ -93,8 +93,8 @@ Index: helpers/external_acl/kerberos_ldap_group/support.h Index: helpers/external_acl/kerberos_ldap_group/support_ldap.cc =================================================================== ---- helpers/external_acl/kerberos_ldap_group/support_ldap.cc.orig 2013-12-30 12:33:27.000000000 +0100 -+++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2014-03-15 00:14:51.423011652 +0100 +--- helpers/external_acl/kerberos_ldap_group/support_ldap.cc.orig ++++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc @@ -801,7 +801,7 @@ get_memberof(struct main_args *margs, ch debug((char *) "%s| %s: DEBUG: Setup Kerberos credential cache\n", LogTime(), PROGRAM); diff --git a/squid-compiled_without_RPM_OPT_FLAGS.patch b/squid-compiled_without_RPM_OPT_FLAGS.patch index 7918bd5..d7c8b08 100644 --- a/squid-compiled_without_RPM_OPT_FLAGS.patch +++ b/squid-compiled_without_RPM_OPT_FLAGS.patch @@ -15,7 +15,7 @@ Index: src/Makefile.in =================================================================== --- src/Makefile.in.orig +++ src/Makefile.in -@@ -7294,7 +7294,7 @@ cache_cf.o: cf_parser.cci +@@ -7295,7 +7295,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 diff --git a/squid-nobuilddates.patch b/squid-nobuilddates.patch index 4690dba..816e2cb 100644 --- a/squid-nobuilddates.patch +++ b/squid-nobuilddates.patch @@ -2,7 +2,7 @@ Index: helpers/basic_auth/fake/fake.cc =================================================================== --- helpers/basic_auth/fake/fake.cc.orig +++ helpers/basic_auth/fake/fake.cc -@@ -74,7 +74,7 @@ main(int argc, char *argv[]) +@@ -96,7 +96,7 @@ main(int argc, char *argv[]) process_options(argc, argv); @@ -11,7 +11,7 @@ Index: helpers/basic_auth/fake/fake.cc while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) { char *p; -@@ -90,6 +90,6 @@ main(int argc, char *argv[]) +@@ -112,6 +112,6 @@ main(int argc, char *argv[]) /* send 'OK' result back to Squid */ SEND_OK(""); } @@ -103,7 +103,7 @@ Index: helpers/url_rewrite/fake/fake.cc =================================================================== --- helpers/url_rewrite/fake/fake.cc.orig +++ helpers/url_rewrite/fake/fake.cc -@@ -79,7 +79,7 @@ main(int argc, char *argv[]) +@@ -101,7 +101,7 @@ main(int argc, char *argv[]) process_options(argc, argv); @@ -112,7 +112,7 @@ Index: helpers/url_rewrite/fake/fake.cc while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) { char *p; -@@ -95,6 +95,6 @@ main(int argc, char *argv[]) +@@ -117,6 +117,6 @@ main(int argc, char *argv[]) /* send 'no-change' result back to Squid */ fprintf(stdout,"\n"); } diff --git a/squid.changes b/squid.changes index ea7ad5c..c763c16 100644 --- a/squid.changes +++ b/squid.changes @@ -3,6 +3,7 @@ Sun Mar 16 08:54:50 UTC 2014 - boris@steki.net - added patch to force kerberos principalname handling ( http://bugs.squid-cache.org/show_bug.cgi?id=4042 ) + * squid-brokenad.patch ------------------------------------------------------------------- Sat Mar 15 12:11:30 UTC 2014 - chris@computersalat.de @@ -19,6 +20,9 @@ Sat Mar 15 12:11:30 UTC 2014 - chris@computersalat.de * ... and all bug fixes from 3.3.12 - fix for bnc#743563 * fix spec(post): remove SLE_10 permissions stuff +- rebased patches: + * squid-compiled_without_RPM_OPT_FLAGS.patch + * squid-nobuilddates.patch ------------------------------------------------------------------- Fri Mar 14 14:34:27 UTC 2014 - boris@steki.net diff --git a/squid.spec b/squid.spec index 11a665e..8e23e71 100644 --- a/squid.spec +++ b/squid.spec @@ -61,7 +61,7 @@ Patch101: %{name}-nobuilddates.patch # squid3 no-rpm-opt-flags :./cf_gen.cc Patch102: %{name}-compiled_without_RPM_OPT_FLAGS.patch # patch fixes kerberos principalname handling (http://bugs.squid-cache.org/show_bug.cgi?id=4042) -Patch103: squid-3.4.2-brokenad.patch +Patch103: squid-brokenad.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq PreReq: %insserv_prereq