[Devil-linux-commit] build/scripts cyrus-imapd, 1.25.2.2, 1.25.2.3 postgresql, 1.13.2.1, 1.13.2.2 usbutils, 1.10, 1.10.2.1

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13146/scripts

Modified Files:
      Tag: rel-1-2-patches
	cyrus-imapd postgresql usbutils 
Log Message:
- updated pci and usb device id databases
- updated wireless_tools to 29
- updated lm_sensors to 2.10.5
- updated dspam to 3.8.0
- updated device-mapper 1.02.22
- updated attr to 2.4.39
- updated acl to 2.2.45
- updated sagator to 0.9.1
- updated xfsprogs 2.8.20
- updated usbutils to 0.73
- updated sysstat 8.0.2
- updated sudo to 1.6.9p7
- updated shorewall to 4.0.5


Index: cyrus-imapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- cyrus-imapd	3 Oct 2005 02:11:25 -0000	1.25.2.2
+++ cyrus-imapd	30 Oct 2007 22:35:32 -0000	1.25.2.3
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       cyrus-imapd
-# Required-Start: $basebuildtools $libs e2fsprogs
+# Required-Start: $basebuildtools $libs e2fsprogs perl
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -25,6 +25,8 @@
 
 MYNAME=CYRUS_IMAPD
 
+PERLDIR=$(ls -d /usr/lib/perl5/5.*/i*linux*)
+
 case $1 in
 	build )
 		if [ "$CONFIG_CYRUS_IMAPD" = "y" ]; then
@@ -41,7 +43,7 @@
 				--with-auth=unix --enable-listext --enable-annotatemore --enable-fulldirhash --enable-sieve || exit 1
 			make depend
 			# parallel build fails, do not use $PMAKE
-			make all DESTDIR=$TMPDIR || exit 1
+			make all || exit 1
 			strip_debug
 
 			#install it, we need it later

Index: postgresql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postgresql,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- postgresql	12 Feb 2005 21:54:25 -0000	1.13.2.1
+++ postgresql	30 Oct 2007 22:35:32 -0000	1.13.2.2
@@ -29,7 +29,8 @@
 	build )
 		if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then
 			./configure --prefix=/usr --sysconfdir=/etc/pgsql --localstatedir=/var --datadir=/var/pgsql \
-				--disable-nls --with-openssl --enable-multibyte --enable-syslog --enable-unicode-conversion --with-perl || exit 1
+				--disable-nls --with-openssl --enable-multibyte --enable-syslog --enable-unicode-conversion \
+				--without-perl || exit 1
 			make $PMAKE all || exit 1
 			
 			strip_debug
@@ -42,11 +43,11 @@
 
 	install )
 		if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR || exit 1
 
 			if [ "$CONFIG_POSTGRESQL_SERVER" = "y" ]; then
-				make install DESTDIR=$WORKDIR/tmp || exit 1
+				make install DESTDIR=$TMPDIR || exit 1
 				groupadd -g 47 postgres || exit 1
 				useradd -u 47 -g postgres -s /bin/bash -d /var/pgsql -c "PostgreSQL Server" postgres || exit 1
 				echo "# Start PostgreSQL Server?" >> $CONFIGFILE
@@ -55,20 +56,20 @@
 				echo "HELP_POSTGRES=\"PostgreSQL is a OpenSource Database\"" >> $SOFTWAREHELP
 				cp $MYDIR/scripts/postgresql $ETCDIR/etc/init.d || exit 1
 			else
-				make -C src/bin install DESTDIR=$WORKDIR/tmp || exit 1
-				make -C src/interfaces install DESTDIR=$WORKDIR/tmp || exit 1
-				make -C doc install DESTDIR=$WORKDIR/tmp || exit 1
+				make -C src/bin install DESTDIR=$TMPDIR || exit 1
+				make -C src/interfaces install DESTDIR=$TMPDIR || exit 1
+				make -C doc install DESTDIR=$TMPDIR || exit 1
 			fi
 
-			copy_docs $WORKDIR/tmp
-			rm -rf $WORKDIR/tmp/usr/include || exit 1
-			rm -rf $WORKDIR/tmp/usr/lib/*.a || exit 1
-			ln -sf postgresql/plperl.so $WORKDIR/tmp/usr/lib/ || exit 1
-			ln -sf postgresql/plpgsql.so $WORKDIR/tmp/usr/lib/ || exit 1
+			copy_docs $TMPDIR
+			rm -rf $TMPDIR/usr/include || exit 1
+			rm -rf $TMPDIR/usr/lib/*.a || exit 1
+			ln -sf postgresql/plperl.so $TMPDIR/usr/lib/ || exit 1
+			ln -sf postgresql/plpgsql.so $TMPDIR/usr/lib/ || exit 1
 
 			mkdir -p $CDDIR
-			cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 		fi
 		;;
 	

Index: usbutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/usbutils,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- usbutils	11 Jan 2004 14:43:05 -0000	1.10
+++ usbutils	30 Oct 2007 22:35:32 -0000	1.10.2.1
@@ -39,7 +39,7 @@
 		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit 1
 
-		rm $WORKDIR/tmp/usr/share/*.ids || exit 1
+		rm $WORKDIR/tmp/usr/share/*.ids
 		mkdir -p $CDDIR/usr/share
 		bzcat $DL_DIR/src/usb.ids.bz2 > $CDDIR/usr/share/usb.ids || exit 1
 		copy_docs $WORKDIR/tmp