[Pkg-shadow-commits] r1343 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-14 13:32:25 +0000 (Wed, 14 Nov 2007)
New Revision: 1343

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/Makefile.am
Log:
Add a variable to set the suid permissions. This should simplify Gentoo's
patch shadow-4.0.11.1-perms.patch.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-10 23:46:11 UTC (rev 1342)
+++ upstream/trunk/ChangeLog	2007-11-14 13:32:25 UTC (rev 1343)
@@ -1,3 +1,9 @@
+2007-11-14  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/Makefile, NEWS: Add a suidperms variable. This should ease
+	the change of permission of suid binaries for distributors (not
+	recommended).
+
 2007-11-10  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* ./, libmisc/, src/, contrib/, doc/, lib/, man/, man/sv/,

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-11-10 23:46:11 UTC (rev 1342)
+++ upstream/trunk/NEWS	2007-11-14 13:32:25 UTC (rev 1343)
@@ -10,6 +10,8 @@
   Fedora's shadow-4.0.18.1-overflow.patch.
 - newgrp: Don't ask for a password if there are no group passwords. Just
   directly give up.
+- The permissions of the suid binaries is now configurable in
+  src/Makefile.am. Note that changing the permissions is not recommended.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2					28-10-2007
 

Modified: upstream/trunk/src/Makefile.am
===================================================================
--- upstream/trunk/src/Makefile.am	2007-11-10 23:46:11 UTC (rev 1342)
+++ upstream/trunk/src/Makefile.am	2007-11-14 13:32:25 UTC (rev 1343)
@@ -4,6 +4,7 @@
 
 ubindir = ${prefix}/bin
 usbindir = ${prefix}/sbin
+suidperms = 4755
 
 INCLUDES = \
 	-I${top_srcdir}/lib \
@@ -91,8 +92,8 @@
 	ln -sf newgrp	$(DESTDIR)$(ubindir)/sg
 	ln -sf vipw	$(DESTDIR)$(usbindir)/vigr
 	for i in $(suidbins); do \
-		chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \
+		chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
 	done
 	for i in $(suidubins); do \
-		chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \
+		chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
 	done