[am-utils/f19] - bz955445 am-utils package should be built with PIE flags.

Ian Kent iankent at fedoraproject.org
Mon May 13 09:57:55 UTC 2013 

commit 1977875b2dc3cc776c27bbf8fa274b087a248fe2
Author: Ian Kent <raven at themaw.net>
Date:   Mon May 13 17:57:25 2013 +0800

    - bz955445 am-utils package should be built with PIE flags.

 ...s-6.1.5-texinfo-documentation-build-fixes.patch |   12 +++
 am-utils-6.1.5-use-_hardened_build-flag.patch      |  103 ++++++++++++++++++++
 am-utils.spec                                      |   19 +++-
 3 files changed, 131 insertions(+), 3 deletions(-)
---
diff --git a/am-utils-6.1.5-texinfo-documentation-build-fixes.patch b/am-utils-6.1.5-texinfo-documentation-build-fixes.patch
new file mode 100644
index 0000000..7305c7d
--- /dev/null
+++ b/am-utils-6.1.5-texinfo-documentation-build-fixes.patch
@@ -0,0 +1,12 @@
+diff -up am-utils-6.1.5/doc/am-utils.texi.orig am-utils-6.1.5/doc/am-utils.texi
+--- am-utils-6.1.5/doc/am-utils.texi.orig	2013-04-28 12:55:39.035902316 +0800
++++ am-utils-6.1.5/doc/am-utils.texi	2013-04-28 12:57:13.865766455 +0800
+@@ -67,7 +67,7 @@ Copyright @copyright{} 1989 Jan-Simon Pe
+ Copyright @copyright{} 1989 Imperial College of Science, Technology & Medicine
+ @*
+ Copyright @copyright{} 1989 The Regents of the University of California.
+- at sp
++ at sp 1
+ All Rights Reserved.
+ @vskip 1ex
+ Permission to copy this document, or any portion of it, as
diff --git a/am-utils-6.1.5-use-_hardened_build-flag.patch b/am-utils-6.1.5-use-_hardened_build-flag.patch
new file mode 100644
index 0000000..668de88
--- /dev/null
+++ b/am-utils-6.1.5-use-_hardened_build-flag.patch
@@ -0,0 +1,103 @@
+diff -up am-utils-6.1.5/amd/Makefile.am.orig am-utils-6.1.5/amd/Makefile.am
+--- am-utils-6.1.5/amd/Makefile.am.orig	2013-04-28 11:00:46.447657616 +0800
++++ am-utils-6.1.5/amd/Makefile.am	2013-04-28 11:01:13.435635544 +0800
+@@ -112,7 +112,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ AM_YFLAGS = -d
+ 
+ # dependencies
+diff -up am-utils-6.1.5/amq/Makefile.am.orig am-utils-6.1.5/amq/Makefile.am
+--- am-utils-6.1.5/amq/Makefile.am.orig	2013-04-28 11:10:03.235036740 +0800
++++ am-utils-6.1.5/amq/Makefile.am	2013-04-28 11:10:15.271022717 +0800
+@@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # additional files to distribute and clean
+ EXTRA_DIST = $(man_MANS)
+diff -up am-utils-6.1.5/fixmount/Makefile.am.orig am-utils-6.1.5/fixmount/Makefile.am
+--- am-utils-6.1.5/fixmount/Makefile.am.orig	2013-04-28 11:10:31.786003486 +0800
++++ am-utils-6.1.5/fixmount/Makefile.am	2013-04-28 11:10:43.373990002 +0800
+@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # additional files to distribute and clean
+ EXTRA_DIST = $(man_MANS)
+diff -up am-utils-6.1.5/fsinfo/Makefile.am.orig am-utils-6.1.5/fsinfo/Makefile.am
+--- am-utils-6.1.5/fsinfo/Makefile.am.orig	2013-04-28 11:10:58.384972545 +0800
++++ am-utils-6.1.5/fsinfo/Makefile.am	2013-04-28 11:11:11.180957646 +0800
+@@ -43,7 +43,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ AM_YFLAGS = -d
+ 
+ # dependencies
+diff -up am-utils-6.1.5/hlfsd/Makefile.am.orig am-utils-6.1.5/hlfsd/Makefile.am
+--- am-utils-6.1.5/hlfsd/Makefile.am.orig	2013-04-28 11:12:47.916845475 +0800
++++ am-utils-6.1.5/hlfsd/Makefile.am	2013-04-28 11:13:12.632816898 +0800
+@@ -24,7 +24,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # additional files to distribute and clean
+ EXTRA_DIST = $(man_MANS)
+diff -up am-utils-6.1.5/libamu/Makefile.am.orig am-utils-6.1.5/libamu/Makefile.am
+--- am-utils-6.1.5/libamu/Makefile.am.orig	2013-04-28 10:47:29.683225080 +0800
++++ am-utils-6.1.5/libamu/Makefile.am	2013-04-28 11:00:21.405678035 +0800
+@@ -69,13 +69,13 @@ libamu_la_DEPENDENCIES = @AMU_LIB_OBJS@
+ 
+ 
+ # LDFLAGS should include standard ones plus LIBTOOL ones
+-AM_LDFLAGS = @LDFLAGS@ @LIBTOOL_LDFLAGS@
++AM_LDFLAGS = @LIBTOOL_LDFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # dependencies
+ $(libamu_la_OBJECTS) $(libamu_la_LIBADD):	\
+diff -up am-utils-6.1.5/mk-amd-map/Makefile.am.orig am-utils-6.1.5/mk-amd-map/Makefile.am
+--- am-utils-6.1.5/mk-amd-map/Makefile.am.orig	2013-04-28 11:13:28.858798119 +0800
++++ am-utils-6.1.5/mk-amd-map/Makefile.am	2013-04-28 11:13:41.095783984 +0800
+@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # additional files to distribute and clean
+ EXTRA_DIST = $(man_MANS)
+diff -up am-utils-6.1.5/wire-test/Makefile.am.orig am-utils-6.1.5/wire-test/Makefile.am
+--- am-utils-6.1.5/wire-test/Makefile.am.orig	2013-04-28 11:14:00.265761847 +0800
++++ am-utils-6.1.5/wire-test/Makefile.am	2013-04-28 11:14:53.069700943 +0800
+@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+-AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
++AM_CFLAGS = $(AMU_CFLAGS)
+ 
+ # additional files to distribute and clean
+ EXTRA_DIST = $(man_MANS)
diff --git a/am-utils.spec b/am-utils.spec
index 2c84e56..5578fde 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd
 Name: am-utils
 Version: 6.1.5
-Release: 26%{?dist}
+Release: 28%{?dist}
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -54,6 +54,12 @@ Patch5: am-utils-6.1.5-expn-temp.patch
 Patch6: am-utils-6.1.5-nolock-toplvl.patch
 # 566711 - am-utils: incorrect use of tcp_wrapper
 Patch7: am-utils-6.1.5-libwarp.patch
+# 955445 - am-utils package should be built with PIE flags
+Patch8: am-utils-6.1.5-use-_hardened_build-flag.patch
+# Fix documentation build fails.
+Patch9: am-utils-6.1.5-texinfo-documentation-build-fixes.patch
+
+%global _hardened_build	1
 
 # We need to filter out some perl requirements for now.
 %define _use_internal_dependency_generator 0
@@ -80,6 +86,8 @@ mounting and unmounting filesystems.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@@ -89,7 +97,7 @@ chmod +x find-requires
 ./bootstrap
 %configure \
         --enable-shared \
-        --enable-am-cflags="${RPM_OPT_FLAGS} -DHAVE_LINUX_NFS_MOUNT_H" \
+        --enable-am-cflags="-DHAVE_LINUX_NFS_MOUNT_H" \
         --enable-libs="-lnsl -lresolv"
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -191,7 +199,12 @@ fi
 %{_libdir}/libamu.so*
 
 %changelog
-* Mon Feb 18 2013 Ian Kent <ikent at redhat.com> - 5:6.1.5-25
+* Mon May 13 2013 Ian Kent <ikent at redhat.com> - 5:6.1.5-28
+- bz955445 - am-utils package should be built with PIE flags
+  - use _hardened_build flag.
+- fix texinfo documentation build fixes.
+
+* Mon Feb 18 2013 Ian Kent <ikent at redhat.com> - 5:6.1.5-26
 - add BuildRequires for texinfo.
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:6.1.5-25

More information about the scm-commits mailing list