[Devil-linux-commit] build/scripts eagle-usb,1.2.2.3,1.2.2.4 sagator,1.6.2.3,1.6.2.4 stunnel,1.10.2.1,1.10.2.2

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

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

Modified Files:
      Tag: rel-1-2-patches
	eagle-usb sagator stunnel 
Log Message:
- updated cvs to 1.12.12
- updated ipac-ng to 1.3.1
- updated stunnel to 4.0.10
- updated libmcrypt to 2.5.7
- updated libgcrypt to 1.2.1
- updated eagle-usb to 2.1.1
- updated shorewall to 2.2.3
- updated IP-Country to 2.19
- updated Mail-SpamAssassin to 3.0.3
- updated clamav to 0.84
- added id3 to 0.75


Index: sagator
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sagator,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- sagator	13 Apr 2005 23:10:14 -0000	1.6.2.3
+++ sagator	1 May 2005 21:22:08 -0000	1.6.2.4
@@ -42,18 +42,20 @@
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr/sbin || exit 1
 			make install DESTDIR=$TMPDIR || exit 1
-
+			
 			rm -rf $TMPDIR/etc/rc.d || exit 1
 			rm -rf $TMPDIR/etc/sysconfig || exit 1
 			cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 			cp -dp $MYDIR/scripts/sagator $ETCDIR/etc/init.d/ || exit 1
 
-			rm -rf $TMPDIR/usr/share || exit 1
-			copy_files $TMPDIR/usr $CDDIR/ || exit 1
-			rm -rf $TMPDIR || exit 1
-
+			copy_docs $TMPDIR
+			
 			mkdir -p $DOCDIR/sagator || exit 1
-			cp -dp README* TODO $DOCDIR/sagator || exit 1
+			cp -dpvR  $TMPDIR/var/www $DOCDIR/sagator || exit 1
+
+			#rm -rf $TMPDIR/usr/share || exit 1
+			cp -dpvR  $TMPDIR/usr $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			useradd -u 65 -d /var/spool/vscan -s /bin/false -g nogroup vscan || exit 1
 			mkdir -p $CDDIR/var/spool/vscan || exit 1

Index: eagle-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- eagle-usb	26 Nov 2004 16:59:14 -0000	1.2.2.3
+++ eagle-usb	1 May 2005 21:22:08 -0000	1.2.2.4
@@ -32,6 +32,7 @@
 		if [ "$CONFIG_EAGLE_USB" = "y" ]; then
 			./autogen.sh || exit 1
 			./configure --prefix=/usr --with-kernel-src=$KERNELDIR --with-lang=en || exit 1
+			replace_str driver/Makefile-2.4 "depmod -a" "true"
 			make || exit 1
 		fi
 		;;
@@ -43,18 +44,11 @@
 			mkdir -p $WORKDIR/tmp/etc/eagle-usb/scripts || exit 1
 			make install DESTDIR=$WORKDIR/tmp || exit 1
 
-			mkdir -p $CDDIR/usr/share/eagle-usb/{dsp,lang} || exit 1
-			mv -f $WORKDIR/tmp/etc/eagle-usb/dsp/* $CDDIR/usr/share/eagle-usb/dsp/ || exit 1
-			mv -f $WORKDIR/tmp/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1
-			rm -rf $WORKDIR/tmp/etc/eagle-usb/{dsp,lang} || exit 1
-
-			copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr/ || exit 1
+			copy_files $WORKDIR/tmp/usr $CDDIR/usr || exit 1
 			copy_files $WORKDIR/tmp/lib $CDDIR || exit 1
 			copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
 
 			cp $MYDIR/scripts/eagle-usb $ETCDIR/etc/init.d || exit 1
-			ln -sf /usr/share/eagle-usb/dsp $ETCDIR/etc/eagle-usb || exit 1
-			ln -sf /usr/share/eagle-usb/lang $ETCDIR/etc/eagle-usb || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 
 			echo "# Initialize the Eagle USB modem?" >> $CONFIGFILE

Index: stunnel
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/stunnel,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- stunnel	7 Apr 2005 18:13:37 -0000	1.10.2.1
+++ stunnel	1 May 2005 21:22:08 -0000	1.10.2.2
@@ -28,10 +28,10 @@
 case $1 in
     build )
 	if [ "$CONFIG_STUNNEL" = "y" ]; then
-	    if [ ! -f .dl-patches.done ]; then
-		bzcat $DL_DIR/src/stunnel-4.09-1_minute_sleep_fix.patch.bz2 | patch -p1 || exit 1
-		touch .dl-patches.done
-	    fi
+	    #if [ ! -f .dl-patches.done ]; then
+		#bzcat $DL_DIR/src/stunnel-4.09-1_minute_sleep_fix.patch.bz2 | patch -p1 || exit 1
+		#touch .dl-patches.done
+	    #fi
 	    #KDIR=$(find_src_dir linux)
 	    #replace_str Makefile /usr/src/linux $KDIR
 	    ./configure --prefix=/usr || exit 1