summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2010-12-20 15:20:01 -0500
committerNalin Dahyabhai <nalin@redhat.com>2010-12-20 15:20:01 -0500
commit09a9ac8a638773db66b8d3385c94420ff7fd9542 (patch)
tree49edd331de2b2633ef762891f8b1021de06b570b
parent0207b5b4fc6156fe005125f2bc58d039f1c5e079 (diff)
downloadkrb5-09a9ac8a638773db66b8d3385c94420ff7fd9542.tar.gz
krb5-09a9ac8a638773db66b8d3385c94420ff7fd9542.tar.xz
krb5-09a9ac8a638773db66b8d3385c94420ff7fd9542.zip
- fix link flags and permissions on shared libraries (ausil)
-rw-r--r--krb5-1.9-buildconf.patch19
-rw-r--r--krb5.spec7
2 files changed, 15 insertions, 11 deletions
diff --git a/krb5-1.9-buildconf.patch b/krb5-1.9-buildconf.patch
index 754962e..12a3359 100644
--- a/krb5-1.9-buildconf.patch
+++ b/krb5-1.9-buildconf.patch
@@ -4,21 +4,22 @@ where they might leak out and affect apps which just want to link with the
libraries. FIXME: needs to check and not just assume that the compiler supports
using these flags.
-diff -up krb5-1.7/src/config/shlib.conf krb5-1.7/src/config/shlib.conf
---- krb5-1.7/src/config/shlib.conf 2008-12-08 17:33:07.000000000 -0500
-+++ krb5-1.7/src/config/shlib.conf 2009-06-04 14:01:28.000000000 -0400
-@@ -421,6 +421,8 @@ mips-*-netbsd*)
- RPATH_FLAG='-Wl,-rpath -Wl,'
+diff -up krb5-1.9/src/config/shlib.conf krb5-1.9/src/config/shlib.conf
+--- krb5-1.9/src/config/shlib.conf 2008-12-08 17:33:07.000000000 -0500
++++ krb5-1.9/src/config/shlib.conf 2009-06-04 14:01:28.000000000 -0400
+@@ -430,7 +430,8 @@
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ PROFFLAGS=-pg
PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) -pie -Wl,-z,relro,-z,now $(LDFLAGS)'
+ INSTALL_SHLIB='${INSTALL} -m755'
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
-diff -up krb5-1.7/src/krb5-config.in krb5-1.7/src/krb5-config.in
---- krb5-1.7/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400
-+++ krb5-1.7/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400
+diff -up krb5-1.9/src/krb5-config.in krb5-1.9/src/krb5-config.in
+--- krb5-1.9/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400
++++ krb5-1.9/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400
@@ -187,8 +187,14 @@ if test -n "$do_libs"; then
-e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
-e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
diff --git a/krb5.spec b/krb5.spec
index b5ac0c2..2561cc9 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -6,7 +6,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.9
-Release: 0%{?dist}.beta3.0
+Release: 0%{?dist}.beta3.1
# Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9-beta3-signed.tar
Source0: krb5-%{version}-beta3.tar.gz
@@ -34,7 +34,7 @@ Source34: kadmind.logrotate
Patch5: krb5-1.8-ksu-access.patch
Patch6: krb5-1.9-ksu-path.patch
Patch12: krb5-1.7-ktany.patch
-Patch16: krb5-1.7-buildconf.patch
+Patch16: krb5-1.9-buildconf.patch
Patch23: krb5-1.3.1-dns.patch
Patch29: krb5-1.9-kprop-mktemp.patch
Patch30: krb5-1.3.4-send-pr-tempfile.patch
@@ -631,6 +631,9 @@ exit 0
%{_sbindir}/uuserver
%changelog
+* Mon Dec 20 2010 Nalin Dahyabhai <nalin@redhat.com> 1.9-0.beta3.1
+- fix link flags and permissions on shared libraries (ausil)
+
* Thu Dec 16 2010 Nalin Dahyabhai <nalin@redhat.com> 1.9-0.beta3.0
- update to 1.9 beta 3