rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version 3.4.4.2

Browse Source 
Fixed: offset of patches
This commit is contained in:
Michal Luscon 2014-04-25 12:43:12 +02:00
parent a7fdc7c3d3
commit 329ae4cb3c
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources
View File

@ -1,2 +1,2 @@
dc2bcb967fc6b15bbbc6b961010c0c00 squid-3.4.4.tar.xz 778a6da2c557e3f731b46e72ff9b0c0e squid-3.4.4.2.tar.xz
cf3a50e5281d7975115483c2ba2e66c8 squid-3.4.4.tar.xz.asc 2da003119042478d23a7b84ee1ff784a squid-3.4.4.2.tar.xz.asc

4
squid-3.1.0.9-config.patch
View File

@ -1,6 +1,6 @@
--- ./src/cf.data.pre 2013-04-27 05:34:48.000000000 +0200 --- ./src/cf.data.pre 2013-04-27 05:34:48.000000000 +0200
+++ ./src/cf.data.pre 2013-05-03 10:13:16.007067356 +0200 +++ ./src/cf.data.pre 2013-05-03 10:13:16.007067356 +0200
@@ -4147,7 +4147,7 @@ @@ -4169,7 +4169,7 @@
NAME: logfile_rotate NAME: logfile_rotate
TYPE: int TYPE: int
@ -9,7 +9,7 @@
LOC: Config.Log.rotateNumber LOC: Config.Log.rotateNumber
DOC_START DOC_START
Specifies the number of logfile rotations to make when you Specifies the number of logfile rotations to make when you
@@ -5751,11 +5751,11 @@ @@ -5773,11 +5773,11 @@
NAME: cache_mgr NAME: cache_mgr
TYPE: string TYPE: string

12
squid-3.1.9-ltdl.patch
View File

@ -1,7 +1,7 @@
diff -up squid-3.1.9/aclocal.m4.ltdl squid-3.1.9/aclocal.m4 diff -up squid-3.1.9/aclocal.m4.ltdl squid-3.1.9/aclocal.m4
--- squid-3.1.9/aclocal.m4.ltdl 2010-10-25 13:34:41.000000000 +0200 --- squid-3.1.9/aclocal.m4.ltdl 2010-10-25 13:34:41.000000000 +0200
+++ squid-3.1.9/aclocal.m4 2010-11-01 14:14:55.297324980 +0100 +++ squid-3.1.9/aclocal.m4 2010-11-01 14:14:55.297324980 +0100
@@ -1217,7 +1217,7 @@ _LT_SET_OPTIONS([$0], [$1]) @@ -1360,7 +1360,7 @@ _LT_SET_OPTIONS([$0], [$1])
LIBTOOL_DEPS="$ltmain" LIBTOOL_DEPS="$ltmain"
# Always use our own libtool. # Always use our own libtool.
@ -13,7 +13,7 @@ diff -up squid-3.1.9/aclocal.m4.ltdl squid-3.1.9/aclocal.m4
diff -up squid-3.1.9/configure.ltdl squid-3.1.9/configure diff -up squid-3.1.9/configure.ltdl squid-3.1.9/configure
--- squid-3.1.9/configure.ltdl 2010-10-25 13:35:32.000000000 +0200 --- squid-3.1.9/configure.ltdl 2010-10-25 13:35:32.000000000 +0200
+++ squid-3.1.9/configure 2010-11-01 14:14:55.320299060 +0100 +++ squid-3.1.9/configure 2010-11-01 14:14:55.320299060 +0100
@@ -10375,7 +10375,7 @@ fi @@ -11000,7 +11000,7 @@ fi
LIBTOOL_DEPS="$ltmain" LIBTOOL_DEPS="$ltmain"
# Always use our own libtool. # Always use our own libtool.
@ -41,16 +41,16 @@ diff -up squid-3.1.9/Makefile.am.ltdl squid-3.1.9/Makefile.am
diff -up squid-3.1.9/Makefile.in.ltdl squid-3.1.9/Makefile.in diff -up squid-3.1.9/Makefile.in.ltdl squid-3.1.9/Makefile.in
--- squid-3.1.9/Makefile.in.ltdl 2010-11-02 08:16:13.630458557 +0100 --- squid-3.1.9/Makefile.in.ltdl 2010-11-02 08:16:13.630458557 +0100
+++ squid-3.1.9/Makefile.in 2010-11-02 08:17:26.543714199 +0100 +++ squid-3.1.9/Makefile.in 2010-11-02 08:17:26.543714199 +0100
@@ -35,7 +35,7 @@ PRE_UNINSTALL = : @@ -79,7 +79,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
-@USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl -@USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
+# @USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl +# @USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure \ $(top_srcdir)/configure $(am__configure_deps) \
@@ -374,7 +374,7 @@ top_build_prefix = @top_build_prefix@ @@ -472,7 +472,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign

4
squid-3.2.0.9-fpic.patch
View File

@ -1,7 +1,7 @@
diff -up squid-3.4.3/compat/Makefile.in.fpic squid-3.4.3/compat/Makefile.in diff -up squid-3.4.3/compat/Makefile.in.fpic squid-3.4.3/compat/Makefile.in
--- squid-3.4.3/compat/Makefile.in.fpic 2014-02-02 09:42:12.000000000 +0100 --- squid-3.4.3/compat/Makefile.in.fpic 2014-02-02 09:42:12.000000000 +0100
+++ squid-3.4.3/compat/Makefile.in 2014-02-04 00:48:38.666316042 +0100 +++ squid-3.4.3/compat/Makefile.in 2014-02-04 00:48:38.666316042 +0100
@@ -367,7 +367,7 @@ target_alias = @target_alias@ @@ -677,7 +677,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@ -25,7 +25,7 @@ diff -up squid-3.4.3/snmplib/Makefile.am.fpic squid-3.4.3/snmplib/Makefile.am
diff -up squid-3.4.3/snmplib/Makefile.in.fpic squid-3.4.3/snmplib/Makefile.in diff -up squid-3.4.3/snmplib/Makefile.in.fpic squid-3.4.3/snmplib/Makefile.in
--- squid-3.4.3/snmplib/Makefile.in.fpic 2014-02-04 00:48:38.667316039 +0100 --- squid-3.4.3/snmplib/Makefile.in.fpic 2014-02-04 00:48:38.667316039 +0100
+++ squid-3.4.3/snmplib/Makefile.in 2014-02-04 00:56:24.497249891 +0100 +++ squid-3.4.3/snmplib/Makefile.in 2014-02-04 00:56:24.497249891 +0100
@@ -336,7 +336,7 @@ target_alias = @target_alias@ @@ -434,7 +434,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@

5
squid.spec
View File

@ -3,7 +3,7 @@
## % define __find_requires %{SOURCE99} ## % define __find_requires %{SOURCE99}
Name: squid Name: squid
Version: 3.4.4 Version: 3.4.4.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
@ -312,6 +312,9 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || : /sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog %changelog
* Fri Apr 25 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.4.2-1
- Update to latest upstream version 3.4.4.2
* Thu Mar 13 2014 Pavel Šimerda <psimerda@redhat.com> - 7:3.4.4-1 * Thu Mar 13 2014 Pavel Šimerda <psimerda@redhat.com> - 7:3.4.4-1
- bump to 3.4.4 - bump to 3.4.4