[Devil-linux-commit] build/scripts id3,NONE,1.1 sagator,1.10,1.11 stunnel,1.11,1.12

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

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

Modified Files:
	sagator stunnel 
Added Files:
	id3 
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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sagator	13 Apr 2005 23:11:00 -0000	1.10
+++ sagator	1 May 2005 21:37:49 -0000	1.11
@@ -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

--- NEW FILE: id3 ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/id3,v $
# $Revision: 1.1 $
# $Date: 2005/05/01 21:37:49 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       id3
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
	build )
	    if [ "$CONFIG_ID3" = "y" ]; then
		make $PMAKE || exit 1
		strip_debug
	    fi
            ;;

	install )
	    if [ "$CONFIG_ID3" = "y" ]; then
		cp id3 $CDDIR/usr/bin || exit 1
	    fi
	    ;;

	* )
	    echo "ERROR ($0)"
	    echo "please add parameter so I know what to do"
	    exit 1
            ;;
esac

Index: stunnel
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/stunnel,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- stunnel	7 Apr 2005 18:13:13 -0000	1.11
+++ stunnel	1 May 2005 21:37:49 -0000	1.12
@@ -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