[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-8-g7295eb6

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 7295eb6cb4c5b5c5120f570f3672b7fcca896683
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Jun 11 19:29:07 2012 +0800

    Ship /var/spool/rootd/* directories as empty directories. (Closes: #677053)

diff --git a/debian/changelog b/debian/changelog
index 241b453..f00834f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ root-system (5.34.00~rc1-2) UNRELEASED; urgency=low
 
   * Fix CVE-2010-3376: insecure library loading. (Closes: #598419)
   * Fix incomplete ftgl-dev => libftgl-dev transition. (Closes: #498677)
+  * root-system-rootd: ship /var/spool/rootd/* as empty directories.
+    (Closes: #677053)
 
- -- Lifeng Sun <lifongsun at gmail.com>  Sun, 10 Jun 2012 18:11:49 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Mon, 11 Jun 2012 21:18:08 +0800
 
 root-system (5.34.00~rc1-1) unstable; urgency=low
 
diff --git a/debian/root-system-rootd.postinst b/debian/root-system-rootd.postinst
index af817a5..c660510 100644
--- a/debian/root-system-rootd.postinst
+++ b/debian/root-system-rootd.postinst
@@ -33,22 +33,19 @@ case "$1" in
 	    #echo Adding system user: rootd.
 	    adduser 				\
 		--system 			\
-		--disabled-login			\
+		--disabled-login		\
 		--ingroup rootd 		\
 		--gecos "Anonymous rootd" 	\
 		--shell /bin/false		\
-		--home /var/spool/rootd 	\
+		--no-create-home		\
 		rootd >/dev/null
 	fi
 
-	# creating rootd home directory
-	if ! test -d /var/spool/rootd; then
-	    mkdir /var/spool/rootd
-	fi
+	chown rootd:rootd /var/spool/rootd
 
 	# modifying the user
 	# usermod -c "Anonymous rootd"    rootd > /dev/null
-	# usermod -d "/var/spool/rootd"   rootd > /dev/null
+	usermod -d "/var/spool/rootd"   rootd > /dev/null
 	# usermod -g "rootd"              rootd > /dev/null
 	# usermod -s "/bin/false"         rootd > /dev/null
 
@@ -60,20 +57,17 @@ case "$1" in
 	#echo "SECURITY: Fixing permission of /var/spool/rootd !"
 	#echo "(I.e. replacing GIDs other than root and rootd with rootd.)"
 	#echo
-	chown rootd:rootd /var/spool/rootd
 	find /var/spool/rootd \
 	    -not \( -group root -or -group rootd \) \
 	    -exec chgrp rootd {} \;
 
-	# Create the tmp and pub directories in /var/spool/rootd and
-	# make them world read- and writable. 
-	if [ ! -d /var/spool/rootd/tmp ] ; then 
-	    mkdir -p /var/spool/rootd/tmp
+	# Make tmp and pub directories in /var/spool/rootd
+	# world read- and writable.
+	if [ -d /var/spool/rootd/tmp ] ; then
 	    chmod 1777 /var/spool/rootd/tmp
 	fi
 
-	if [ ! -d /var/spool/rootd/pub ] ; then 
-	    mkdir -p /var/spool/rootd/pub
+	if [ -d /var/spool/rootd/pub ] ; then
 	    chmod 1777 /var/spool/rootd/pub
 	fi
 
diff --git a/debian/root-system-rootd.prerm b/debian/root-system-rootd.prerm
index 2bc3be6..ba3262d 100644
--- a/debian/root-system-rootd.prerm
+++ b/debian/root-system-rootd.prerm
@@ -20,7 +20,7 @@ case "$1" in
 	# Taken from mysql-server package and modified for ROOT 
         # rm -rf /var/spool/rootd
 	if getent passwd rootd > /dev/null; then 
-	    deluser --remove-home rootd
+	    deluser rootd
 	    reason=$?
             if [ $reason -ne 0 ] ; then 
 	        # Could not remove user. Ignore. 
diff --git a/debian/rules b/debian/rules
index 55ebcd3..d59b2d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -771,9 +771,11 @@ install-arch: build-arch
 	# try to fix lintian's rpath error.
 	for i in bin rootd proofd ; do \
 	  mkdir -p debian/root-system-$$i/usr/lib/root/ ; \
-	  echo "/usr/lib/root/" >> debian/root-system-$$i.install ; \
 	done
 
+	mkdir -p debian/root-system-rootd/var/spool/rootd/tmp
+	mkdir -p debian/root-system-rootd/var/spool/rootd/pub
+
 	# This is for alternatives registration, if one want's to install
 	# Richard Kreckels cint package next to ROOT
 	# mv debian/root-system-bin/$(PREFIX)/bin/cint \

-- 
root-system: CERN's ROOT Data Analysis Framework