[squid/f14/master] - fixes #647967 - build with -fPIE option back and dropped proper libltdl usage

[Jiri Skala]

commit 08f687a11f3f92c0a9d17b298d0ad1a4c8f3e748
Author: Jiri Skala <jskala at localhost.(none)>
Date:   Thu Nov 4 08:30:59 2010 +0100

    - fixes #647967 - build with -fPIE option back and dropped proper libltdl usage

 squid-3.1.9-ltdl.patch |   61 ++++++++++++++++++++++++++++++++++++++++++++++++
 squid.spec             |   17 +++++++++++-
 2 files changed, 76 insertions(+), 2 deletions(-)
---
diff --git a/squid-3.1.9-ltdl.patch b/squid-3.1.9-ltdl.patch
new file mode 100644
index 0000000..de0654a
--- /dev/null
+++ b/squid-3.1.9-ltdl.patch
@@ -0,0 +1,61 @@
+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	2010-11-01 14:14:55.297324980 +0100
+@@ -1117,7 +1117,7 @@ _LT_SET_OPTIONS([$0], [$1])
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ _LT_SETUP
+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	2010-11-01 14:14:55.320299060 +0100
+@@ -9066,7 +9066,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) libtool'
+ 
+ 
+ 
+diff -up squid-3.1.9/Makefile.am.ltdl squid-3.1.9/Makefile.am
+--- squid-3.1.9/Makefile.am.ltdl	2010-11-02 08:16:07.165707548 +0100
++++ squid-3.1.9/Makefile.am	2010-11-02 08:16:52.977565320 +0100
+@@ -2,11 +2,8 @@
+ #
+ 
+ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
+-DIST_SUBDIRS	= compat lib libltdl snmplib scripts src icons errors contrib doc helpers test-suite tools
++DIST_SUBDIRS	= compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+ SUBDIRS		= compat lib $(makesnmplib)
+-if USE_LOADABLE_MODULES
+-SUBDIRS += libltdl
+-endif
+ SUBDIRS += scripts src icons errors doc helpers test-suite tools
+ 
+ DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
+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	2010-11-02 08:17:26.543714199 +0100
+@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at USE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
++# @USE_LOADABLE_MODULES_TRUE at am__append_1 = libltdl
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+@@ -272,7 +272,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
+-DIST_SUBDIRS = compat lib libltdl snmplib scripts src icons errors contrib doc helpers test-suite tools
++DIST_SUBDIRS = compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+ SUBDIRS = compat lib $(makesnmplib) $(am__append_1) scripts src icons \
+ 	errors doc helpers test-suite tools
+ DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/squid.spec b/squid.spec
index f021997..5acf36e 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.9
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2
@@ -31,6 +31,7 @@ Patch202: squid-3.1.0.9-location.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
+Patch209: squid-3.1.9-ltdl.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -53,7 +54,7 @@ BuildRequires: expat-devel libxml2-devel
 # TPROXY requires libcap, and also increases security somewhat
 BuildRequires: libcap-devel
 # eCAP and some other need libltdl
-BuildRequires: libtool-ltdl-devel
+BuildRequires: libtool libtool-ltdl-devel
 
 %description
 Squid is a high-performance proxy caching server for Web clients,
@@ -77,8 +78,17 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
+%patch209 -p1 -b .ltdl
 
 %build
+%ifarch sparcv9 sparc64 s390 s390x
+   export CXXFLAGS="$RPM_OPT_FLAGS -fPIE"
+   export CFLAGS="$RPM_OPT_FLAGS -fPIE"
+%else
+   export CXXFLAGS="$RPM_OPT_FLAGS -fpie"
+   export CFLAGS="$RPM_OPT_FLAGS -fpie"
+%endif
+export LDFLAGS="-pie"
 
 %configure \
    --exec_prefix=/usr \
@@ -259,6 +269,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Thu Nov 04 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.9-3
+- fixes #647967 - build with -fPIE option back and dropped proper libltdl usage
+
 * Mon Oct 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.1.9-2
 - Upstream 3.1.9 bugfix release