From c13b2cc186d3532a55864aa44f13665086cde889 Mon Sep 17 00:00:00 2001 From: Michal Luscon Date: Fri, 3 May 2013 11:21:35 +0200 Subject: [PATCH] Rebase to latest upstream version 3.3.4 --- .gitignore | 1 + sources | 2 +- squid-3.1.0.9-config.patch | 17 ++++++++--------- squid-3.2.9.tar.bz2.asc | 20 -------------------- squid-3.3.4.tar.bz2.asc | 20 ++++++++++++++++++++ squid-NCSA_auth.patch | 23 ----------------------- squid.spec | 11 +++++------ squidclient-man.patch | 23 ----------------------- 8 files changed, 35 insertions(+), 82 deletions(-) delete mode 100644 squid-3.2.9.tar.bz2.asc create mode 100644 squid-3.3.4.tar.bz2.asc delete mode 100644 squid-NCSA_auth.patch delete mode 100644 squidclient-man.patch diff --git a/.gitignore b/.gitignore index bd25b2d..f983003 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ squid-3.1-10021.patch /squid-3.2.7.tar.bz2 /squid-3.2.8.tar.bz2 /squid-3.2.9.tar.bz2 +/squid-3.3.4.tar.bz2 diff --git a/sources b/sources index ef0f251..bd034d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de02be3c1f72e0d818374438044261a6 squid-3.2.9.tar.bz2 +0ef8e63a980389c62130fa639079fb54 squid-3.3.4.tar.bz2 diff --git a/squid-3.1.0.9-config.patch b/squid-3.1.0.9-config.patch index 09d7a15..a9cb3a5 100644 --- a/squid-3.1.0.9-config.patch +++ b/squid-3.1.0.9-config.patch @@ -1,26 +1,25 @@ -diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre ---- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200 -+++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200 -@@ -2135,7 +2136,7 @@ DOC_END +--- ./src/cf.data.pre 2013-04-27 05:34:48.000000000 +0200 ++++ ./src/cf.data.pre 2013-05-03 10:13:16.007067356 +0200 +@@ -3876,7 +3876,7 @@ NAME: logfile_rotate TYPE: int -DEFAULT: 10 -+DEFAULT: 0 ++DEFAULT: 0 LOC: Config.Log.rotateNumber DOC_START Specifies the number of logfile rotations to make when you -@@ -3254,11 +3256,11 @@ COMMENT_END +@@ -5300,11 +5300,11 @@ NAME: cache_mgr TYPE: string -DEFAULT: webmaster -+DEFAULT: root ++DEFAULT: root LOC: Config.adminEmail DOC_START Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster." -+ mail if the cache dies. The default is "root." +- mail if the cache dies. The default is "webmaster". ++ mail if the cache dies. The default is "root". DOC_END NAME: mail_from diff --git a/squid-3.2.9.tar.bz2.asc b/squid-3.2.9.tar.bz2.asc deleted file mode 100644 index 12cba62..0000000 --- a/squid-3.2.9.tar.bz2.asc +++ /dev/null @@ -1,20 +0,0 @@ -File: squid-3.2.9.tar.bz2 -Date: Tue Mar 12 10:47:39 UTC 2013 -Size: 2897511 -MD5 : de02be3c1f72e0d818374438044261a6 -SHA1: a2cec791e333a492a1d243c2e6228cb93a9de39d -Key : 0xFF5CF463 - fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 - keyring = http://www.squid-cache.org/pgp.asc - keyserver = subkeys.pgp.net ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iQEcBAABAgAGBQJRP76eAAoJELJo5wb/XPRjVeMH+wYmoYLcIwLMjnhCoQRLDEjP -YAbgpaspWisUNKwUsAeb4c58wIA/OXYalD+4B6evNKMz5EhLNAPCP+VdQj8FERU8 -7ibeOgXmNPizuDpwMVJAeAIcVVp8+QjswBGBoMDXgr/5wmJrF2238N3VuqwYwZ5R -vFcpIDK/2yUh09os6ncR3j7BTe9A7qUU4AVcYiBL670U/ASHhGhh8rihRVlbhCJY -BrwBb+nGQUwnjwCptzC4dONv/hZYJ55WZ/j29xQS5OfDeJM91l4VGdoGOCwMgjLi -ygx4dbMfKv86e+WxfHmuyXajgMe+IwarUmlDQxHQpaVS+kksM6avj3YbieIo8/0= -=jsS7 ------END PGP SIGNATURE----- diff --git a/squid-3.3.4.tar.bz2.asc b/squid-3.3.4.tar.bz2.asc new file mode 100644 index 0000000..245a8cc --- /dev/null +++ b/squid-3.3.4.tar.bz2.asc @@ -0,0 +1,20 @@ +File: squid-3.3.4.tar.bz2 +Date: Sat Apr 27 04:00:16 UTC 2013 +Size: 2987756 +MD5 : 0ef8e63a980389c62130fa639079fb54 +SHA1: fdbdcafb7ab2a4aabf5fb0d7ccb700f7b7b9e4c0 +Key : 0xFF5CF463 + fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 + keyring = http://www.squid-cache.org/pgp.asc + keyserver = subkeys.pgp.net +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQEcBAABAgAGBQJRe05JAAoJELJo5wb/XPRjrWIIANBTcue7r2h4Ra/KNKXSUSEG +ZjTKLRhDYdMEreCrhy4XrMXDtZXR3UHknzJVeeu9d7toBL5D6FR2wWcEzehoVBtx +JL9DCOHFty3oaSXP8cLNKQ7yVmTGQs7WBNOvUllNb9mAyITpJ9Ruk2U3c6YYeTUo +G0Yf+OyZsQCH5Vyn8cKHZ56Nmv1yOC9/ed0PBC+pDc9f44aTKgUKB3NN+5aA//7w +rIi3Au2IFsEiVJhzpZk+HmgF4qh2kNh/qzR+Vx5FX61BonzpjP/UdJQWFwrEjSXG +e6AxHylaoKLI1/OQ7WFZrxFEHPwQpXoOGR9zIsifKdxRUrtyHxwm511IvSVSHAM= +=S0PM +-----END PGP SIGNATURE----- diff --git a/squid-NCSA_auth.patch b/squid-NCSA_auth.patch deleted file mode 100644 index a4e9b90..0000000 --- a/squid-NCSA_auth.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2013-03-02 02:46:03.000000000 +0100 -+++ ./helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2013-03-07 15:45:22.000000000 +0100 -@@ -114,6 +114,7 @@ - time_t change_time = -1; - char buf[HELPER_INPUT_BUFFER]; - char *user, *passwd, *p; -+ char *crypted; - user_data *u; - setbuf(stdout, NULL); - if (argc != 2) { -@@ -147,10 +148,10 @@ - if (u == NULL) { - SEND_ERR("No such user"); - #if HAVE_CRYPT -- } else if (strlen(passwd) <= 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) { -+ } else if (strlen(passwd) <= 8 && (crypted = crypt(passwd, u->passwd)) && (strcmp(u->passwd, crypted) == 0)) { - // Bug 3107: crypt() DES functionality silently truncates long passwords. - SEND_OK(""); -- } else if (strlen(passwd) > 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) { -+ } else if (strlen(passwd) > 8 && (crypted = crypt(passwd, u->passwd)) && (strcmp(u->passwd, crypted) == 0)) { - // Bug 3107: crypt() DES functionality silently truncates long passwords. - SEND_ERR("Password too long. Only 8 characters accepted."); - #endif diff --git a/squid.spec b/squid.spec index f0181c7..b8f88c5 100644 --- a/squid.spec +++ b/squid.spec @@ -3,8 +3,8 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.2.9 -Release: 3%{?dist} +Version: 3.3.4 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -37,8 +37,6 @@ Patch202: squid-3.1.0.9-location.patch Patch203: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.2.0.9-fpic.patch Patch205: squid-3.1.9-ltdl.patch -Patch206: squid-NCSA_auth.patch -Patch207: squidclient-man.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 @@ -106,8 +104,6 @@ The squid-sysvinit contains SysV initscritps support. %patch203 -p1 -b .perlpath %patch204 -p1 -b .fpic %patch205 -p1 -b .ltdl -%patch206 -p1 -b .NCSA_auth -%patch207 -p1 -b .squidclient-man %build %ifarch sparcv9 sparc64 s390 s390x @@ -311,6 +307,9 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Fri May 3 2013 Michal Luscon - 7:3.3.4-1 +- Rebase to latest upstream version 3.3.4 + * Tue Apr 23 2013 Michal Luscon - 7:3.2.9-3 - Option '-k' is not stated in squidclient man - Remove pid from service file(#913262) diff --git a/squidclient-man.patch b/squidclient-man.patch deleted file mode 100644 index ac3f367..0000000 --- a/squidclient-man.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./tools/squidclient.1 2013-03-12 11:15:58.000000000 +0100 -+++ ./tools/squidclient.1 2013-04-23 12:19:11.000000000 +0200 -@@ -21,7 +21,8 @@ - ping interval - .if !'po4a'hide' .B "] [ \-j '" - Host header --.if !'po4a'hide' .B "' ] [ \-l" -+.if !'po4a'hide' .B "' ] [ \-k" -+.if !'po4a'hide' .B "] [ \-l" - local host - .if !'po4a'hide' .B "] [ \-m" - method -@@ -98,6 +99,10 @@ - Host header content - . - .if !'po4a'hide' .TP -+.if !'po4a'hide' .B "\-k" -+Keep the connection active. Default is to do only one request then close. -+. -+.if !'po4a'hide' .TP - .if !'po4a'hide' .B "\-l host" - Specify a local IP address to bind to. Default is none. - .