From 18cfb4811deef502216f4f42c1e1db327eedd832 Mon Sep 17 00:00:00 2001
From: fenlason <fenlason@fedoraproject.org>
Date: Thu, 20 Oct 2005 03:17:04 +0000
Subject: [PATCH] Upgrade -pie patch to work on x86_64 (I hope)

---
 quagga-0.98.5-pie.patch | 229 +++++++++++++++++++++++++++++++++++-----
 quagga.spec             |   3 +-
 2 files changed, 203 insertions(+), 29 deletions(-)

diff --git a/quagga-0.98.5-pie.patch b/quagga-0.98.5-pie.patch
index 3980e49..d025b55 100644
--- a/quagga-0.98.5-pie.patch
+++ b/quagga-0.98.5-pie.patch
@@ -18,11 +18,22 @@
        else
  	command="$base_compile $srcfile $pic_flag"
        fi
---- quagga-0.98.5/makefiles.diff.pie	2005-10-18 23:07:44.000000000 -0400
-+++ quagga-0.98.5/makefiles.diff	2005-10-18 23:05:17.000000000 -0400
-@@ -0,0 +1,131 @@
-+--- quagga-0.98.5/bgpd/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/bgpd/Makefile	2005-10-18 22:43:31.000000000 -0400
+--- quagga-0.98.5/makefiles.diff	2005-10-19 23:09:23.000000000 -0400
++++ quagga-0.98.5.sav/makefiles.diff	2005-10-19 23:08:33.000000000 -0400
+@@ -0,0 +1,306 @@
++--- quagga-0.98.5/Makefile	2005-10-19 22:57:47.000000000 -0400
+++++ quagga-0.98.5.sav/Makefile	2005-10-19 22:41:06.000000000 -0400
++@@ -112,7 +112,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/bgpd/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/bgpd/Makefile	2005-10-19 23:07:12.000000000 -0400
 +@@ -86,7 +86,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -32,8 +43,28 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/isisd/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/isisd/Makefile	2005-10-18 22:43:38.000000000 -0400
++@@ -145,7 +145,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/doc/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/doc/Makefile	2005-10-19 23:07:30.000000000 -0400
++@@ -109,7 +109,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/isisd/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/isisd/Makefile	2005-10-19 23:07:33.000000000 -0400
 +@@ -84,7 +84,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -43,8 +74,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/lib/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/lib/Makefile	2005-10-18 22:43:43.000000000 -0400
++@@ -145,7 +145,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/lib/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/lib/Makefile	2005-10-19 23:07:37.000000000 -0400
 +@@ -70,7 +70,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -54,8 +94,28 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/ospf6d/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/ospf6d/Makefile	2005-10-18 22:43:49.000000000 -0400
++@@ -122,7 +122,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/m4/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/m4/Makefile	2005-10-19 23:07:40.000000000 -0400
++@@ -88,7 +88,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/ospf6d/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/ospf6d/Makefile	2005-10-19 23:07:42.000000000 -0400
 +@@ -84,7 +84,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -65,8 +125,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/ospfclient/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/ospfclient/Makefile	2005-10-18 22:43:54.000000000 -0400
++@@ -143,7 +143,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/ospfclient/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/ospfclient/Makefile	2005-10-19 23:07:44.000000000 -0400
 +@@ -75,7 +75,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -76,8 +145,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/ospfd/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/ospfd/Makefile	2005-10-18 22:43:58.000000000 -0400
++@@ -127,7 +127,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/ospfd/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/ospfd/Makefile	2005-10-19 23:07:46.000000000 -0400
 +@@ -82,7 +82,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -87,8 +165,39 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/ripd/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/ripd/Makefile	2005-10-18 22:44:05.000000000 -0400
++@@ -136,7 +136,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/pkgsrc/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/pkgsrc/Makefile	2005-10-19 23:07:48.000000000 -0400
++@@ -96,7 +96,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/redhat/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/redhat/Makefile	2005-10-19 23:07:52.000000000 -0400
++@@ -89,7 +89,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/ripd/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/ripd/Makefile	2005-10-19 23:07:54.000000000 -0400
 +@@ -74,7 +74,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -98,8 +207,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/ripngd/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/ripngd/Makefile	2005-10-18 22:44:09.000000000 -0400
++@@ -133,7 +133,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/ripngd/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/ripngd/Makefile	2005-10-19 23:07:56.000000000 -0400
 +@@ -78,7 +78,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -109,8 +227,28 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/tests/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/tests/Makefile	2005-10-18 22:44:24.000000000 -0400
++@@ -137,7 +137,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/solaris/Makefile	2005-10-19 23:05:38.000000000 -0400
+++++ quagga-0.98.5.sav/solaris/Makefile	2005-10-19 23:07:58.000000000 -0400
++@@ -91,7 +91,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/tests/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/tests/Makefile	2005-10-19 23:08:00.000000000 -0400
 +@@ -57,7 +57,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -120,8 +258,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/vtysh/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/vtysh/Makefile	2005-10-18 22:44:31.000000000 -0400
++@@ -107,7 +107,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/vtysh/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/vtysh/Makefile	2005-10-19 23:08:03.000000000 -0400
 +@@ -65,7 +65,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -131,8 +278,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/watchquagga/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/watchquagga/Makefile	2005-10-18 22:44:36.000000000 -0400
++@@ -124,7 +124,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/watchquagga/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/watchquagga/Makefile	2005-10-19 23:08:05.000000000 -0400
 +@@ -59,7 +59,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -142,8 +298,17 @@
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 + 	$(AM_CFLAGS) $(CFLAGS)
-+--- quagga-0.98.5/zebra/Makefile.pie	2005-10-18 22:43:11.000000000 -0400
-++++ quagga-0.98.5/zebra/Makefile	2005-10-18 22:44:40.000000000 -0400
++@@ -109,7 +109,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
++--- quagga-0.98.5/zebra/Makefile	2005-10-19 23:05:37.000000000 -0400
+++++ quagga-0.98.5.sav/zebra/Makefile	2005-10-19 23:08:07.000000000 -0400
 +@@ -71,7 +71,7 @@
 + depcomp = $(SHELL) $(top_srcdir)/depcomp
 + am__depfiles_maybe = depfiles
@@ -152,3 +317,13 @@
 ++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
 + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 + 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ 	$(AM_CFLAGS) $(CFLAGS)
++@@ -130,7 +130,7 @@
++ ISISD = 
++ KERNEL_METHOD = 
++ LD = /usr/bin/ld -m elf_x86_64
++-LDFLAGS = 
+++LDFLAGS = -pie
++ LIBCAP = -lcap
++ LIBOBJS = 
++ LIBPAM = -lpam -lpam_misc
diff --git a/quagga.spec b/quagga.spec
index 1601c0c..7aec9b9 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -108,7 +108,6 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 #./autogen.sh                                                                 
 export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
-export LDFLAGS="-pie"
 
 %configure \
 %if %with_ipv6
@@ -345,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Oct 17 2005 Jay Fenlason <fenlason@redhat.com> 0.98.5-3
+* Wed Oct 19 2005 Jay Fenlason <fenlason@redhat.com> 0.98.5-3
 - add the -pie patch, to make -fPIE compiling actually work on all platforms.
 - Include -pam patch to close
   bz#170256 ? pam_stack is deprecated