[Pkg-gnupg-commit] r198 - in /gnupg/branches/experimental/debian: changelog rules

[thijs at users.alioth.debian.org]

Author: thijs
Date: Sat Nov 13 16:18:18 2010
New Revision: 198

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=198
Log:
Install gpg setuid root again on kFreeBSD. We dropped this
bit earlier because it's not necessary anymore on Linux, but
the kFreeBSD kernel still requires it for secure memory.
Thanks Robert Millan for the patch. (Closes: 598471)

Modified:
    gnupg/branches/experimental/debian/changelog
    gnupg/branches/experimental/debian/rules

Modified: gnupg/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/changelog?rev=198&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/changelog (original)
+++ gnupg/branches/experimental/debian/changelog Sat Nov 13 16:18:18 2010
@@ -1,3 +1,12 @@
+gnupg (1.4.11-3) UNRELEASED; urgency=low
+
+  * Install gpg setuid root again on kFreeBSD. We dropped this
+    bit earlier because it's not necessary anymore on Linux, but
+    the kFreeBSD kernel still requires it for secure memory.
+    Thanks Robert Millan for the patch. (Closes: 598471)
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 13 Nov 2010 17:16:46 +0100
+
 gnupg (1.4.11-2) experimental; urgency=low
 
   * Update standards-version to 3.9.1, no changes needed.

Modified: gnupg/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/rules?rev=198&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/rules (original)
+++ gnupg/branches/experimental/debian/rules Sat Nov 13 16:18:18 2010
@@ -18,6 +18,7 @@
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH_OS  := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CONFARGS  = --prefix=/usr --libexecdir=/usr/lib/ \
             --enable-mailto --with-mailprog=/usr/sbin/sendmail \
@@ -129,6 +130,11 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+	# see http://www.gnupg.org/faq.html#q6.1
+	chown root:root	debian/gnupg/usr/bin/gpg
+	chmod 4755	debian/gnupg/usr/bin/gpg
+endif
 	dh_installdeb
 	dh_shlibdeps -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends
 	dh_gencontrol