[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

icecream/debian



SVN commit 557748 by woebbe:

- also create a group icecc for the user icecc
- build with -O2


 M  +8 -0      changelog  
 M  +1 -1      control  
 M  +12 -5     icecc.postinst  
 M  +14 -3     icecc.postrm  
 M  +3 -0      rules  


--- trunk/icecream/debian/changelog #557747:557748
@@ -1,3 +1,11 @@
+icecc (0.7.3-4) unstable; urgency=low
+
+  * Also create a group icecc for the user icecc.
+
+  * Build with -O2.
+
+ -- Andre Woebbeking <Woebbeking@web.de>  Mon, 03 Jun 2006 23:50:12 +0200
+
 icecc (0.7.3-3) unstable; urgency=low
 
   * Create libicecc-dev package.
--- trunk/icecream/debian/control #557747:557748
@@ -9,7 +9,7 @@
 Package: icecc
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, adduser, debconf
+Depends: ${shlibs:Depends}, adduser, coreutils, debconf, grep
 Suggests: icecc-monitor
 Description: Simple distributed compiler client and server
  icecc is a program to distribute compilation of C or C++ code across
--- trunk/icecream/debian/icecc.postinst #557747:557748
@@ -109,15 +109,22 @@
 		update_config_file icecc/daemon START_ICECC
 		update_config_file icecc/scheduler START_ICECC_SCHEDULER 
 
+		ICECC_GROUP=icecc
 		ICECC_USER=icecc
+		ICECC_HOME=/var/cache/icecc
 
+		# Create group
+		grep -q $ICECC_GROUP /etc/group || \
+		( echo Creating $ICECC_GROUP group... ; \
+		addgroup --quiet --system $ICECC_GROUP)
+
 		# Create user
-		id $ICECC_USER > /dev/null 2>&1 ||
-		( echo Creating $ICECC_USER user... ;
-		adduser --quiet --system --ingroup nogroup \
-		--home / --no-create-home $ICECC_USER )
+		grep -q $ICECC_USER /etc/passwd || \
+		( echo Creating $ICECC_USER user... ; \
+		adduser --quiet --system --ingroup $ICECC_GROUP \
+		--home $ICECC_HOME --no-create-home $ICECC_USER )
 
-		chown $ICECC_USER /var/cache/icecc
+		chown $ICECC_USER:$ICECC_GROUP $ICECC_HOME
 
 		db_stop
 		;;
--- trunk/icecream/debian/icecc.postrm #557747:557748
@@ -5,10 +5,21 @@
 
 case "$1" in
 	purge)
-		rm -rf /var/cache/icecc
+		ICECC_GROUP=icecc
+		ICECC_USER=icecc
+		ICECC_HOME=/var/cache/icecc
+
 		rm -f $conffile
-		echo Deleting icecc user...
-		deluser --quiet --system icecc
+
+		grep -q $ICECC_USER /etc/passwd && \
+		(echo Deleting $ICECC_USER user... ; \
+		deluser --quiet --system $ICECC_USER)
+
+		grep -q $ICECC_GROUP /etc/group && \
+		(echo Deleting $ICECC_GROUP group... ; \
+		delgroup --quiet --system $ICECC_GROUP)
+
+		rm -rf $ICECC_HOME
 		;;
 	remove)
 		;;	
--- trunk/icecream/debian/rules #557747:557748
@@ -8,6 +8,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export CFLAGS=-O2
+export CXXFLAGS=-O2
+
 objdir = $(CURDIR)/obj
 
 -include debian/debiandirs



Reply to: