[krb5] - override INSTALL_SETUID at build-time so that ksu is installed into the buildroot with the right

Nalin Dahyabhai nalin at fedoraproject.org
Fri Apr 1 19:52:08 UTC 2011


commit 2ee39c5e61739b53cd3db284ab71a161c84963b3
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Fri Apr 1 15:52:29 2011 -0400

    - override INSTALL_SETUID at build-time so that ksu is installed into
      the buildroot with the right permissions (part of #225974)

 krb5-1.9-buildconf.patch |   12 ++++++++++++
 krb5.spec                |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/krb5-1.9-buildconf.patch b/krb5-1.9-buildconf.patch
index 12a3359..8641a24 100644
--- a/krb5-1.9-buildconf.patch
+++ b/krb5-1.9-buildconf.patch
@@ -36,3 +36,15 @@ diff -up krb5-1.9/src/krb5-config.in krb5-1.9/src/krb5-config.in
      if test $library = 'kdb'; then
  	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
  	library=krb5
+diff -up krb5-1.9/src/config/pre.in krb5-1.9/src/config/pre.in
+--- krb5-1.9/src/config/pre.in	2011-04-01 15:45:06.640705226 -0400
++++ krb5-1.9/src/config/pre.in	2011-04-01 15:45:11.179705234 -0400
+@@ -188,7 +188,7 @@
+ INSTALL_SCRIPT=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_SHLIB=@INSTALL_SHLIB@
+-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
++INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755
+ ## This is needed because autoconf will sometimes define @exec_prefix@ to be
+ ## ${prefix}.
+ prefix=@prefix@
diff --git a/krb5.spec b/krb5.spec
index 7c99a6f..29bd518 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -657,6 +657,10 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Fri Apr  1 2011 Nalin Dahyabhai <nalin at redhat.com>
+- override INSTALL_SETUID at build-time so that ksu is installed into
+  the buildroot with the right permissions (part of #225974)
+
 * Fri Mar 18 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9-8
 - backport change from SVN to fix a computed-value-not-used warning in
   kpropd (#684065)


More information about the scm-commits mailing list