From 69f6e17f75559fd78cb2469fc903f2cf6d3cfda9 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Tue, 4 Feb 2014 01:10:01 +0100 Subject: [PATCH] 3.4.3 conflicts: squid-3.2.0.9-fpic.patch (fuzz) --- sources | 4 ++-- squid-3.2.0.9-fpic.patch | 30 +++++++++++++++--------------- squid.spec | 7 +++++-- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sources b/sources index 6282bd5..436b46d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8fe456b7666f6e81a22bfd7ca20462cc squid-3.4.1.tar.xz -2fff4b2893b6a122fe2bab10917174f7 squid-3.4.1.tar.xz.asc +158983014574731a93cb62b51adbdf37 squid-3.4.3.tar.xz +5e63176a41d3dd0bed3b98bada92bc21 squid-3.4.3.tar.xz.asc diff --git a/squid-3.2.0.9-fpic.patch b/squid-3.2.0.9-fpic.patch index aa44924..e4fa130 100644 --- a/squid-3.2.0.9-fpic.patch +++ b/squid-3.2.0.9-fpic.patch @@ -1,7 +1,7 @@ -diff -up squid-3.2.0.9/compat/Makefile.in.fpic squid-3.2.0.9/compat/Makefile.in ---- squid-3.2.0.9/compat/Makefile.in.fpic 2011-07-01 11:38:35.332618191 +0200 -+++ squid-3.2.0.9/compat/Makefile.in 2011-07-01 11:41:07.207345197 +0200 -@@ -370,7 +370,7 @@ target_alias = @target_alias@ +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 2014-02-04 00:48:38.666316042 +0100 +@@ -367,7 +367,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -10,9 +10,9 @@ diff -up squid-3.2.0.9/compat/Makefile.in.fpic squid-3.2.0.9/compat/Makefile.in AM_CXXFLAGS = $(SQUID_CXXFLAGS) CLEANFILES = testHeaders INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \ -diff -up squid-3.2.0.9/snmplib/Makefile.am.fpic squid-3.2.0.9/snmplib/Makefile.am ---- squid-3.2.0.9/snmplib/Makefile.am.fpic 2011-07-01 11:40:12.557741046 +0200 -+++ squid-3.2.0.9/snmplib/Makefile.am 2011-07-01 11:41:10.201378312 +0200 +diff -up squid-3.4.3/snmplib/Makefile.am.fpic squid-3.4.3/snmplib/Makefile.am +--- squid-3.4.3/snmplib/Makefile.am.fpic 2014-02-04 00:48:38.666316042 +0100 ++++ squid-3.4.3/snmplib/Makefile.am 2014-02-04 00:50:09.017139167 +0100 @@ -2,7 +2,7 @@ ## ## Makefile for libsnmp. @@ -20,17 +20,17 @@ diff -up squid-3.2.0.9/snmplib/Makefile.am.fpic squid-3.2.0.9/snmplib/Makefile.a -AM_CFLAGS = $(SQUID_CFLAGS) +AM_CFLAGS = $(SQUID_CFLAGS) -fPIC AM_CXXFLAGS = $(SQUID_CXXFLAGS) - noinst_LIBRARIES = libsnmplib.a - libsnmplib_a_SOURCES = asn1.c parse.c snmp_vars.c \ -diff -up squid-3.2.0.9/snmplib/Makefile.in.fpic squid-3.2.0.9/snmplib/Makefile.in ---- squid-3.2.0.9/snmplib/Makefile.in.fpic 2011-07-01 12:04:44.083181152 +0200 -+++ squid-3.2.0.9/snmplib/Makefile.in 2011-07-01 12:05:06.796437407 +0200 -@@ -339,7 +339,7 @@ target_alias = @target_alias@ + noinst_LTLIBRARIES = libsnmplib.la + libsnmplib_la_SOURCES = asn1.c parse.c snmp_vars.c \ +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 2014-02-04 00:56:24.497249891 +0100 +@@ -336,7 +336,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = $(SQUID_CFLAGS) +AM_CFLAGS = $(SQUID_CFLAGS) -fPIC AM_CXXFLAGS = $(SQUID_CXXFLAGS) - noinst_LIBRARIES = libsnmplib.a - libsnmplib_a_SOURCES = asn1.c parse.c snmp_vars.c \ + noinst_LTLIBRARIES = libsnmplib.la + libsnmplib_la_SOURCES = asn1.c parse.c snmp_vars.c \ diff --git a/squid.spec b/squid.spec index 3be34cd..cfef819 100644 --- a/squid.spec +++ b/squid.spec @@ -3,8 +3,8 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.4.3 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -312,6 +312,9 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Tue Feb 04 2014 Henrik Nordstrom - 7:3.4.3-1 +- Update to latest upstream bugfix version 3.4.3 + * Mon Jan 06 2014 Pavel Šimerda - 7:3.4.1-2 - Resolves: #1038160 - avoid running squid's own supervisor process