devil-linux-commit — Mailing list for CVS commit messages.

[Devil-linux-commit] build/scripts modsecurity-apache,1.2,1.3

[Björn R. <br...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8156

Modified Files:
	modsecurity-apache 
Log Message:
mlogc needs curl to build


Index: modsecurity-apache
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modsecurity-apache,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- modsecurity-apache	26 Apr 2010 14:27:22 -0000	1.2
+++ modsecurity-apache	8 Nov 2010 10:00:42 -0000	1.3
@@ -22,18 +22,23 @@
 			cd apache2 || exit 1
 			./configure --prefix=/usr || exit 1
 			make all || exit 1
-			make -C mlogc-src all || exit 1
+			if [ "$CONFIG_CURL" = "y" ]; then
+				# mlogc needs curl to build
+				make -C mlogc-src all || exit 1
+			fi
 		fi
 		;;
 
 	install )
 		if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_MODSECURITY" = "y" ]; then
-		    cp -v apache2/.libs/mod_security2.so $CDDIR/usr/lib/apache2/modules/ || exit 1
-		    mkdir -p $ETCDIR/etc/apache2/modsecurity_crs || exit 1
-		    cp -vR rules/* $ETCDIR/etc/apache2/modsecurity_crs/ || exit 1
-		    cp -v apache2/mlogc-src/mlogc $CDDIR/usr/bin/ || exit 1
-		    cp -v apache2/mlogc-src/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1
-		    cp -v apache2/mlogc-src/mlogc-default.conf $ETCDIR/etc/ || exit 1
+			cp -v apache2/.libs/mod_security2.so $CDDIR/usr/lib/apache2/modules/ || exit 1
+			mkdir -p $ETCDIR/etc/apache2/modsecurity_crs || exit 1
+			cp -vR rules/* $ETCDIR/etc/apache2/modsecurity_crs/ || exit 1
+			if [ "$CONFIG_CURL" = "y" ]; then
+				cp -v apache2/mlogc-src/mlogc $CDDIR/usr/bin/ || exit 1
+				cp -v apache2/mlogc-src/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1
+				cp -v apache2/mlogc-src/mlogc-default.conf $ETCDIR/etc/ || exit 1
+			fi
 		fi
 		;;
 

[Devil-linux-commit] build CHANGES,1.1416,1.1417

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12417

Modified Files:
	CHANGES 
Log Message:
it's about time...


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1416
retrieving revision 1.1417
diff -u -d -r1.1416 -r1.1417
--- CHANGES	6 Nov 2010 14:09:49 -0000	1.1416
+++ CHANGES	6 Nov 2010 21:39:20 -0000	1.1417
@@ -21,7 +21,7 @@
 #
 #
 
-1.4RC7
+1.4
 - updated open-vm-tools to 2010.10.18-313025
 - closed bug #91 - Freeradius links to startup script
 - updated install-on-usb.bat (Dominic Raferd / HZ)

[Devil-linux-commit] build/scripts/config VERSION,1.29,1.30

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

Update of /cvsroot/devil-linux/build/scripts/config
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12417/scripts/config

Modified Files:
	VERSION 
Log Message:
it's about time...


Index: VERSION
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/VERSION,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- VERSION	3 Oct 2010 14:18:18 -0000	1.29
+++ VERSION	6 Nov 2010 21:39:20 -0000	1.30
@@ -1 +1 @@
-1.4RC7
+1.4

[Devil-linux-commit] build/scripts/scripts install-on-usb.exe, NONE, 1.1 install-on-usb.bat, 1.2, 1.3

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12161/scripts/scripts

Modified Files:
	install-on-usb.bat 
Added Files:
	install-on-usb.exe 
Log Message:
updated windows version of install-usb and added executable version


--- NEW FILE: install-on-usb.exe ---
(This appears to be a binary file; contents omitted.)

Index: install-on-usb.bat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install-on-usb.bat	4 Nov 2010 18:10:12 -0000	1.2
+++ install-on-usb.bat	6 Nov 2010 21:36:46 -0000	1.3
@@ -1,3 +1,23 @@
+ECHO OFF
+REM  QBFC Project Options Begin
+REM  HasVersionInfo: Yes
+REM  Companyname: DEVIL-LINUX
+REM  Productname: winstall-on-usb
+REM  Filedescription: Devil-Linux USB Windows Installer Program
+REM  Copyrights: 
+REM  Trademarks: 
+REM  Originalname: install-on-usb.bat
+REM  Comments: coded by Dominic
+REM  Productversion:  0. 0. 0. 0
+REM  Fileversion:  0. 5. 0. 0
+REM  Internalname: 
+REM  Appicon: devil-linux.ico
+REM  Embeddedfile: fart.exe
+REM  Embeddedfile: syslinux.exe
+REM  QBFC Project Options End
+ECHO ON
+ECHO OFF
+ECHO OFF
 @ECHO OFF
 : Devil-Linux Windows USB Installer
 
@@ -18,21 +38,29 @@
 : Rev 0.3a 2010-11-01 - made it work as bare system no auto-drive searching and copy progress
 :                     - best using it by dragging the drive icon on top of this batchfile
 :                     - or by using as a command line tool, specifying the drive as parameter
-: Rev 0.4b 2010-11-01 - restore copy with progress indicator
+: Rev 0.4b 2010-11-01 - restore copy-with-progress indicator
 :                     - prevent run if a file rather than a drive has been specified
 :                     - tidy messages, add colour, check for admin privileges
 : Rev 0.4c 2010-11-03 - tiny but critical bugfix
+: Rev 0.5  2010-11-04 - adjustments to work also as exe, compiled with QuickBatchFileCompiler
+:                     - removed (again!) copy-with-progress (does not work when compiled)
 
-SETLOCAL ENABLEDELAYEDEXPANSION
+SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 CLS
 COLOR 1F
 ECHO.
 ECHO                             %~nx0
 ECHO.
-
+IF "%MYFILES%" == "" (
+	SET FILELOC=%~dp0
+	SET COMPILED=n
+) ELSE (
+	SET FILELOC=%MYFILES%\
+	SET COMPILED=y
+)
 REM check for presence of drive specification
 IF "%1"=="" GOTO :help
-SET DRIVE=%1
+SET DRIVE=%~1
 REM check for presence of colon
 IF "%DRIVE:~1,1%" NEQ ":" SET FATALERR=y&ECHO You must specify a drive as parameter e.g. F:>&2
 REM check that it is only a drive that has been specified, not a file
@@ -43,26 +71,26 @@
 IF /I "%DRIVE%"=="c:" SET FATALERR=y&ECHO You cannot install to drive C:>&2
 REM originating drive not allowed
 IF /I "%DRIVE%"=="%~d0" SET FATALERR=y&ECHO You cannot install to the drive you are running from ^(%DRIVE%^)>&2
-
 REM check for presence of required files
 IF "%2" NEQ "" (
 	SET ZIPEXE=%2\7z.exe
 ) ELSE (
 	SET ZIPEXE=C:\PROGRA~1\7-Zip\7z.exe
-	IF NOT EXIST "!ZIPEXE!" (
-		SET ZIPEXE=C:\PROGRA~2\7-Zip\7z.exe
-		IF NOT EXIST "!ZIPEXE!" (
-			ECHO Can't locate 7z.exe, please obtain and install 7-Zip from http://www.7-zip.org>&2
-			ECHO or, if already installed, provide path to 7z.exe as parameter>&2
-			GOTO :erredexit
-		)
-	)
 )
-IF NOT EXIST "%~dp0fart.exe" SET FATALERR=y & ECHO Can't locate fart.exe, obtain this from SourceForge>&2
-IF NOT EXIST "%~dp0syslinux.exe" SET FATALERR=y & ECHO Can't locate syslinux.exe, obtain this by extracting from the latest syslinux     release at kernel.org>&2
+IF NOT EXIST "%ZIPEXE%" SET ZIPEXE=C:\PROGRA~2\7-Zip\7z.exe
+IF NOT EXIST "%ZIPEXE%" (
+	ECHO Can't locate 7z.exe, please obtain and install 7-Zip from http://www.7-zip.org>&2
+	ECHO or, if already installed, provide path to 7z.exe as 2nd parameter>&2
+	GOTO :erredexit
+)
+IF NOT EXIST "%FILELOC%fart.exe" SET FATALERR=y & ECHO Can't locate fart.exe, obtain this from SourceForge>&2
+IF NOT EXIST "%FILELOC%syslinux.exe" SET FATALERR=y & ECHO Can't locate syslinux.exe, obtain this by extracting from the latest syslinux     release at kernel.org>&2
 IF NOT EXIST "%~dp0bootcd.iso" SET FATALERR=y & ECHO Can't locate bootcd.iso>&2
 REM end if there was a fatal error
-IF "%FATALERR%" NEQ "" ECHO Aborting, for help run without parameters>&2&GOTO :erredexit
+IF NOT "%FATALERR%" == "" (
+	ECHO Aborting, for help run without parameters>&2
+	GOTO :erredexit
+)
 REM check that we have administrator privileges, this is a kludge but it works...
 IF EXIST "%windir%\system32\%~nx0-test\nul" RMDIR "%windir%\system32\%~nx0-test"
 MKDIR "%windir%\system32\%~nx0-test" 2>nul
@@ -71,7 +99,6 @@
 REM start with a clean %TEMP%\boot directory
 RMDIR /S /Q "%TEMP%\boot\" 2>nul
 MKDIR "%TEMP%\boot\" 2>nul
-
 REM extract 3 small files immediately - we need them later anyway, 
 REM getting them now allows us to extract DL version
 "%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%\boot" DEVIL-LINUX LICENSE isolinux.cfg>nul
@@ -79,7 +106,6 @@
 REN "%TEMP%\boot\isolinux.cfg" syslinux.cfg
 IF ERRORLEVEL 1 GOTO :erred
 SET /P DLVER=""<"%TEMP%\boot\DEVIL-LINUX"
-
 ECHO This will make %DRIVE% into Devil-Linux %DLVER% boot disk
 ECHO Please choose configuration:
 ECHO   [1] Clean installation
@@ -122,10 +148,10 @@
 IF ERRORLEVEL 1 ECHO Error extracting shadow>&2&&GOTO :erred
 PUSHD "%TEMP%\boot\config"
 REM switch on sshd
-"%~dp0fart.exe" -q -- "etc-mods\sysconfig\config" "START_SSHD=no" "START_SSHD=yes"
+"%FILELOC%fart.exe" -q -- "etc-mods\sysconfig\config" "START_SSHD=no" "START_SSHD=yes"
 IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set SSHD to operate at start-up>&2&&GOTO :erred
 REM set 'devil' password
-"%~dp0fart.exe" -q -- "etc-mods\shadow" "$1$JHH/CiJE$nDKJJh2hEmE8x2VePkyVP/" "$1$Jrgbm29u$TzBgorXoLccnRS23WWvq10"
+"%FILELOC%fart.exe" -q -- "etc-mods\shadow" "$1$JHH/CiJE$nDKJJh2hEmE8x2VePkyVP/" "$1$Jrgbm29u$TzBgorXoLccnRS23WWvq10"
 IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set root password>&2&&GOTO :erred
 REM create autoselect eth0 dhcp network
 MKDIR "etc-mods\sysconfig\nic\">nul
@@ -138,7 +164,7 @@
 ECHO BROADCAST=>>etc-mods\sysconfig\nic\ifcfg-eth0
 ECHO ROUTE=>>etc-mods\sysconfig\nic\ifcfg-eth0
 REM remove CRs from files
-"%~dp0fart.exe" -q -C --remove -- "etc-mods\shadow","etc-mods\sysconfig\nic\ifcfg-eth0" "\r"
+"%FILELOC%fart.exe" -q -C --remove -- "etc-mods\shadow","etc-mods\sysconfig\nic\ifcfg-eth0" "\r"
 IF %ERRORLEVEL% EQU 0 GOTO :erred
 REM add/update files in etc-mods.tar
 "%ZIPEXE%" u etc-mods.tar etc-mods\sysconfig\config etc-mods\sysconfig\nic\ifcfg-eth0 etc-mods\shadow>nul
@@ -153,7 +179,7 @@
 
 :skip_mod_config
 ECHO Configuring files
-"%~dp0fart.exe" --remove -q -- "%TEMP%\boot\syslinux.cfg","%TEMP%\boot\message" "/boot/"
+"%FILELOC%fart.exe" --remove -q -- "%TEMP%\boot\syslinux.cfg","%TEMP%\boot\message" "/boot/"
 REM fart.exe uses ERRORLEVEL to report number of changes: at time of writing there are 21 file changes, but allow some latitude
 IF %ERRORLEVEL% LSS 12 (SET ERRORLEVEL=1&&GOTO :erred) ELSE IF %ERRORLEVEL% GEQ 30 SET ERRORLEVEL=1&&GOTO :erred
 
@@ -174,35 +200,32 @@
 IF ERRORLEVEL 1 CHKDSK %DRIVE%&GOTO :erredexit
 
 SET /P "dummyvar=Installing Syslinux MBR and BootSector on %DRIVE%... "<nul
-"%~dp0syslinux" -ma %DRIVE%
+"%FILELOC%syslinux" -ma %DRIVE%
 IF ERRORLEVEL 1 GOTO :erred
 ECHO done
 
-SET /P "dummyvar=Copying files to %DRIVE%, may take a few minutes"<nul
+SET /P "dummyvar=Copying files to %DRIVE%"<nul
 REM xcopy does not work to USB drive under Vista, and we don't need the subdirectories anyway
 COPY "%TEMP%\boot" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
 SET /P "dummyvar=."<nul
-
 REM for ease of maintenance put usb-install files on USB too
 COPY "%~dp0*usb*" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
 SET /P "dummyvar=."<nul
 COPY "%~dp0*.exe" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
-SET /P "dummyvar=."<nul
-
+ECHO . done
 REM put bootcd.iso file on drive, CopyWithProgress provides progress indicator
-Call :CopyWithProgress "%~dp0bootcd.iso" %DRIVE%
-IF ERRORLEVEL 1 (
+REM Call :CopyWithProgress "%~dp0bootcd.iso" %DRIVE%
+REM IF ERRORLEVEL 1 (
 	REM if CopyWithProgress failed then try with an ordinary COPY
-	ECHO.
-	ECHO Copying large file: bootcd.iso, PLEASE BE PATIENT...
+	SET /P "dummyvar=Copying large file bootcd.iso to %DRIVE%, please be patient..."<nul
 	copy "%~dp0bootcd.iso" %DRIVE%
-	IF ERRORLEVEL 1 GOTO :erred
-) ELSE (
-	ECHO . done
-)
+REM	IF ERRORLEVEL 1 GOTO :erred
+REM ) ELSE (
+	ECHO  done
+REM )
 
 SET /P "dummyvar=Deleting temporary files.."<nul
 RMDIR /S /Q "%TEMP%\boot" 2>nul
@@ -216,27 +239,26 @@
 IF %ERRORLEVEL% NEQ 0 GOTO :erred
 
 ECHO.
-ECHO Success! %DRIVE% contains bootable Devil-Linux %DLVER% with %CONFIG%.
+ECHO Success^! %DRIVE% contains bootable Devil-Linux %DLVER% with %CONFIG%.
 GOTO :end
 
-:CopyWithProgress
-:: Copy, displaying progress dots
-SETLOCAL ENABLEDELAYEDEXPANSION
-SET Flagfile=%TEMP%\%RANDOM%.tmp
-IF EXIST %Flagfile% DEL %Flagfile%
-START /MIN COPY %* ^& ECHO.^>%Flagfile% ^& EXIT
-SET LOOP=0
-:Pcopy
-IF EXIST %Flagfile% Goto :EOF
-::Show a period
-REM SET /P dummyvar=!LOOP!<NUL
-SET /P dummyvar=.<NUL
-::Wait c.3 secs
-ping -n 6 localhost > NUL
-::Loop counter should not exceed 100 i.e. c.5 minutes
-SET /A LOOP=!LOOP!+1
-IF %LOOP% GTR 100 EXIT /B 1
-GOTO Pcopy
+REM :CopyWithProgress
+REM :: Copy, displaying progress dots
+REM SETLOCAL ENABLEDELAYEDEXPANSION
+REM SET Flagfile=%TEMP%\%RANDOM%.tmp
+REM IF EXIST %Flagfile% DEL %Flagfile%
+REM START /MIN COPY %* ^& ECHO.^>%Flagfile% ^& EXIT
+REM SET LOOP=0
+REM :Pcopy
+REM IF EXIST %Flagfile% Goto :EOF
+REM ::Show a period
+REM SET /P dummyvar=.<NUL
+REM ::Wait c.3 secs
+REM ping -n 6 localhost > NUL
+REM ::Loop counter should not exceed 100 i.e. c.5 minutes
+REM SET /A LOOP=!LOOP!+1
+REM IF %LOOP% GTR 100 EXIT /B 1
+REM GOTO Pcopy
 
 :erred
 ECHO.>&2
@@ -250,20 +272,25 @@
 EXIT /B 1
 
 :help
-ECHO This formats and provisions a USB drive as a Devil-Linux boot disk.
+ECHO This formats and provisions USB drive as Devil-Linux boot disk.
 ECHO.
-ECHO Usage       : %~nx0 DRIVE:[\] [7z.exe-location]
-ECHO Dependencies: 7-Zip, syslinux.exe (32bit), fart.exe
+ECHO Usage (1)   : drag'n'drop USB drive onto %~nx0
+ECHO       (2)   : %~nx0 DRIVE:[\] [7z.exe-location]
+ECHO.
+IF "%COMPILED%" == "y" (
+	ECHO Dependencies: 7-Zip, bootcd.iso
+) ELSE (
+	ECHO Dependencies: 7-Zip, syslinux.exe ^(32bit^), fart.exe, bootcd.iso
+)
 ECHO Tested on   : Windows XP / Vista / 7 32/64-bit
 ECHO.
-ECHO Notes       : Easy start - drag'n'drop USB drive onto %~nx0.
-ECHO               Must be run as administrator / with admin privleges
+ECHO Notes       : Must be run as administrator / with admin privileges.
+ECHO               bootcd.iso must be in same location as %~nx0.
 ECHO               You are prompted before changes are committed to USB drive.
-ECHO               The USB drive cannot be drive C:
 ECHO               1st or only partition of USB drive is (re)formatted, but any
-ECHO                 existing 2nd partition on USB drive (e.g. holding existing DL
-ECHO                 configuration) is not changed.
+ECHO                 existing 2nd partition on USB drive (e.g. holding existing
+ECHO                 Devil-Linux configuration) is not changed.
 ECHO               7z.exe-location does not normally need to be specified.
 ECHO.
 :end
-PAUSE
\ No newline at end of file
+PAUSE

[Devil-linux-commit] build/scripts build.sh,1.108,1.109

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12161/scripts

Modified Files:
	build.sh 
Log Message:
updated windows version of install-usb and added executable version


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- build.sh	28 Sep 2010 00:23:57 -0000	1.108
+++ build.sh	6 Nov 2010 21:36:46 -0000	1.109
@@ -200,6 +200,7 @@
 			cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb.bat $DISTDIR || exit 1
+			cp $DL_DIR/scripts/scripts/install-on-usb.exe $DISTDIR || exit 1
 			cp $WORKDIR/bootcd.iso $DISTDIR || exit 1
 			#if [ "$CONFIG_ZISOFS" = "y" ]; then
 			#	cp $CDDIR.z/config/etc.tar.bz2 $DISTDIR || exit 1

[Devil-linux-commit] build CHANGES, 1.1415, 1.1416 md5sum.lst, 1.600, 1.601

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv734

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated open-vm-tools to 2010.10.18-313025


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -u -d -r1.1415 -r1.1416
--- CHANGES	4 Nov 2010 19:13:01 -0000	1.1415
+++ CHANGES	6 Nov 2010 14:09:49 -0000	1.1416
@@ -22,6 +22,7 @@
 #
 
 1.4RC7
+- updated open-vm-tools to 2010.10.18-313025
 - closed bug #91 - Freeradius links to startup script
 - updated install-on-usb.bat (Dominic Raferd / HZ)
 - updated gradm to 2.2.0-201010311752

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -d -r1.600 -r1.601
--- md5sum.lst	2 Nov 2010 17:13:14 -0000	1.600
+++ md5sum.lst	6 Nov 2010 14:09:49 -0000	1.601
@@ -348,7 +348,7 @@
 6f893b61b07915e7a139324fa3f79121  src/nut-2.4.3.tar.gz
 cf1c017496b066b45ffe3d7a303fd6ad  src/oidentd-2.0.7.tar.gz
 d47af933c407d7ad0e5beae9169893b6  src/open-iscsi-git-20100509.tar.bz2
-7496668da499f1d425dbb6d4f6c6a484  src/open-vm-tools-2010.08.24-292196.tar.gz
+2e3762950356d436dc5ccec51a2b78db  src/open-vm-tools-2010.10.18-313025.tar.gz
 d7043ba34b5038f0113b099ede0884fb  src/openh323-v1_18_0-src.tar.gz
 e1dd82f54cffad3d76da9e712dc58c48  src/openl2tp-0.19_ppp_unix.c.patch.bz2
 87f035ca5ddf7c61e720f422cdc997cf  src/openl2tp-1.6.tar.gz

[Devil-linux-commit] build/scripts/scripts freeradius,NONE,1.1

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18064/scripts/scripts

Added Files:
	freeradius 
Log Message:
- closed bug #91 - Freeradius links to startup script


--- NEW FILE: freeradius ---
#!/bin/bash
#
# $Source: /cvsroot/devil-linux/build/scripts/scripts/freeradius,v $
# $Revision: 1.1 $
# $Date: 2010/11/04 19:13:02 $
#
# http://www.devil-linux.org
#

### BEGIN INIT INFO
# Provides:       freeradius
# Required-Start: $network $syslog $named
# Required-Stop:  $network $syslog $named
# Default-Start:  2 3 5
# Default-Stop:   6 0
# Description:    starts freeradius
### END INIT INFO

# settings
source /etc/sysconfig/config

# parameters
CONFIGNAME=FREERADIUS
PARAMETER=

# source function library
source /etc/init.d/functions

eval START=\$START_$CONFIGNAME

# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}

# Force execution if not called by a runlevel directory.
test $link = $base && START=yes
test "$START" = "yes" || exit 0

[Devil-linux-commit] build/scripts freeradius,1.9,1.10

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18064/scripts

Modified Files:
	freeradius 
Log Message:
- closed bug #91 - Freeradius links to startup script


Index: freeradius
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/freeradius,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- freeradius	6 Jan 2010 14:53:27 -0000	1.9
+++ freeradius	4 Nov 2010 19:13:02 -0000	1.10
@@ -44,7 +44,8 @@
 			copy_files $TMPDIR/var $CDDIR/ || exit 1
 			copy_files $TMPDIR/etc/raddb $ETCDIR/etc/ || exit 1
 	
-			cp scripts/rc.radiusd $ETCDIR/etc/init.d/freeradius || exit 1
+			cp $MYDIR/scripts/freeradius $ETCDIR/etc/init.d || exit 1
+			cat scripts/rc.radiusd >> $ETCDIR/etc/init.d/freeradius || exit 1
 			rm -rf $TMPDIR || exit 1
 
 			echo "# start freeradius?" >> $CONFIGFILE

[Devil-linux-commit] build CHANGES,1.1414,1.1415

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18064

Modified Files:
	CHANGES 
Log Message:
- closed bug #91 - Freeradius links to startup script


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1414
retrieving revision 1.1415
diff -u -d -r1.1414 -r1.1415
--- CHANGES	4 Nov 2010 18:10:12 -0000	1.1414
+++ CHANGES	4 Nov 2010 19:13:01 -0000	1.1415
@@ -22,6 +22,7 @@
 #
 
 1.4RC7
+- closed bug #91 - Freeradius links to startup script
 - updated install-on-usb.bat (Dominic Raferd / HZ)
 - updated gradm to 2.2.0-201010311752
 - updated grsecurity to 2.2.0-2.6.32.25-201010311944

[Devil-linux-commit] build/scripts/scripts install-on-usb.ico, NONE, 1.1 install-on-usb.bat, 1.1, 1.2

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3106/scripts/scripts

Modified Files:
	install-on-usb.bat 
Added Files:
	install-on-usb.ico 
Log Message:
- updated install-on-usb.bat (Dominic Raferd / HZ)


--- NEW FILE: install-on-usb.ico ---
(This appears to be a binary file; contents omitted.)

Index: install-on-usb.bat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install-on-usb.bat	28 Sep 2010 00:23:58 -0000	1.1
+++ install-on-usb.bat	4 Nov 2010 18:10:12 -0000	1.2
@@ -10,26 +10,43 @@
 :	syslinux.exe	http://www.kernel.org/pub/linux/utils/boot/syslinux/
 
 : History:
-: Rev 0.1 2010-08-13 - skip unnecessary subdirectories, check drive is big enough, optimize a little
-: Rev 0.2 2010-08-18 - tested with Windows 7/2008 64-bit
-:                    - improved error checking/messaging
-:                    - offer options for pre-loaded default and remote login configurations
-: Rev 0.3 2010-08-20 - improved disk size checking and selection
+: Rev 0.1  2010-08-13 - skip unnecessary subdirectories, check drive is big enough, optimize a little
+: Rev 0.2  2010-08-18 - tested with Windows 7/2008 64-bit
+:                     - improved error checking/messaging
+:                     - offer options for pre-loaded default and remote login configurations
+: Rev 0.3  2010-08-20 - improved disk size checking and selection
+: Rev 0.3a 2010-11-01 - made it work as bare system no auto-drive searching and copy progress
+:                     - best using it by dragging the drive icon on top of this batchfile
+:                     - or by using as a command line tool, specifying the drive as parameter
+: Rev 0.4b 2010-11-01 - restore copy with progress indicator
+:                     - prevent run if a file rather than a drive has been specified
+:                     - tidy messages, add colour, check for admin privileges
+: Rev 0.4c 2010-11-03 - tiny but critical bugfix
+
 SETLOCAL ENABLEDELAYEDEXPANSION
+CLS
+COLOR 1F
 ECHO.
-ECHO %~nx0
-ECHO.
-ECHO This makes the first partition of a removable drive into Devil-Linux boot disk
-ECHO using Devil-Linux bootcd.iso.
-ECHO.
-SET /P RESPONSE="Press any key to continue, or h for help or q to quit: "
+ECHO                             %~nx0
 ECHO.
-IF /I "%RESPONSE%"=="q" GOTO :erredexit
-IF /I "%RESPONSE%"=="h" GOTO :help
+
+REM check for presence of drive specification
+IF "%1"=="" GOTO :help
+SET DRIVE=%1
+REM check for presence of colon
+IF "%DRIVE:~1,1%" NEQ ":" SET FATALERR=y&ECHO You must specify a drive as parameter e.g. F:>&2
+REM check that it is only a drive that has been specified, not a file
+IF "%DRIVE%" NEQ "%DRIVE:~0,3%" SET FATALERR=y&ECHO You must specify a drive as parameter e.g. F:>&2
+REM strips \ from drive specification
+SET DRIVE=%DRIVE:~0,2%
+REM drive c: not allowed
+IF /I "%DRIVE%"=="c:" SET FATALERR=y&ECHO You cannot install to drive C:>&2
+REM originating drive not allowed
+IF /I "%DRIVE%"=="%~d0" SET FATALERR=y&ECHO You cannot install to the drive you are running from ^(%DRIVE%^)>&2
 
 REM check for presence of required files
-IF "%1" NEQ "" (
-	SET ZIPEXE=%1\7z.exe
+IF "%2" NEQ "" (
+	SET ZIPEXE=%2\7z.exe
 ) ELSE (
 	SET ZIPEXE=C:\PROGRA~1\7-Zip\7z.exe
 	IF NOT EXIST "!ZIPEXE!" (
@@ -41,87 +58,20 @@
 		)
 	)
 )
-IF NOT EXIST "%~dp0fart.exe" ECHO Can't locate fart.exe, aborting...>&2 && GOTO :erredexit
-IF NOT EXIST "%~dp0syslinux.exe" ECHO Can't locate syslinux.exe, aborting...>&2 && GOTO :erredexit
-IF NOT EXIST "%~dp0bootcd.iso" ECHO Can't locate bootcd.iso, aborting...>&2 && GOTO :erredexit
-REM set required space to bootcd.iso+8MB, at time of writing we actually need bootcd.iso+7.01MB
-FOR /F "tokens=3" %%A IN ('DIR %~dp0bootcd.iso /-c^|findstr -R "bootcd.iso$"') DO SET /A REQDSIZE=%%A+8388608
-SET /A REQDSIZEMB=%REQDSIZE%/1048576
-REM Obtain Windows Version as number (5.0=2000, 5.1=XP, 5.2=2003, 6.0=Vista, 6.1=7/2008)
-FOR /F "tokens=2* delims=[]" %%A IN ('VER') DO FOR /F "tokens=2,3 delims=. " %%B IN ("%%A") DO SET WINVER=%%B.%%C
-REM Create list of logical drives and sizes
-WMIC LOGICALDISK GET Name,Size>"%TEMP%\%~n0-drives.txt"
-ECHO The following possible installation drives have been found:>"%TEMP%\%~n0-validdrives.txt"
-SET VALID=0
-REM Obtain list of removable drives
-FOR %%i in (D: E: F: G: H: I: J: K: L: M: N: O: P: Q: R: S: T: U: V: W: X: Y: Z:) DO (
-	fsutil fsinfo drivetype %%i>"%TEMP%\%~n0-drivetype.txt"
-	REM The FSUTIL utility requires that you have administrative privileges.
-	IF ERRORLEVEL 1 (
-		ECHO An error occurred using FSUTIL:>&2
-		TYPE "%TEMP%\%~n0-drivetype.txt">&2
-		ECHO.>&2
-		IF %WINVER% GEQ 6.0 (
-			ECHO Note: You may need to right-click %~nx0 and>&2
-			ECHO       'Run as Administrator'>&2
-		) ELSE (
-			ECHO Note: You need administrative privileges to run %~nx0.>&2
-		)
-		ECHO.>&2
-		GOTO :erredexit
-	)
-	"%~dp0fart.exe" -q "%TEMP%\%~n0-drivetype.txt" "Removable">nul 2>&1
-	IF ERRORLEVEL 1 (
-		REM Block installation to the drive from which this batch file is running
-		IF /I %%i NEQ %~d0 (
-			SET DSIZEMB=0
-			FOR /F "tokens=2" %%A IN ('TYPE "%TEMP%\%~n0-drives.txt"^|FIND /i "%%i"') DO SET /A DSIZEMB=%%A/1048576
-			REM Block installation to any drive that is too small
-			IF !DSIZEMB! GTR %REQDSIZEMB% (
-				SET VALIDDRIVES=!VALIDDRIVES! %%i
-				ECHO   %%i ^(!DSIZEMB!MB^)>>"%TEMP%\%~n0-validdrives.txt"
-				SET /A VALID=!VALID!+1
-			) ELSE (
-				IF !DSIZE! EQU 0 (
-					SET VALIDDRIVES=!VALIDDRIVES! %%i
-					ECHO   %%i ^(unknown size^)>>"%TEMP%\%~n0-validdrives.txt"
-					SET /A VALID=!VALID!+1
-				)
-			)
-		) ELSE ECHO Please copy contents of %%i to a local directory and run from there>&2&&GOTO :erred
-	)
-)
-IF "%VALIDDRIVES%"=="" (
-	ECHO No Removable Drives found>&2
-	ECHO Note: You may need to run %~nx0 as Administrator>&2
-	ECHO Aborting>&2
-	GOTO :erredexit
-)
-REM strip leading space
-SET VALIDDRIVES=%VALIDDRIVES:~1%
-
-REM Select installation drive
-IF %VALID% EQU 1 (
-	SET DRIVE=%VALIDDRIVES%
-	ECHO Drive !DRIVE! autoselected as the only possible valid installation drive
-	GOTO :skipselection
-)
-TYPE "%TEMP%\%~n0-validdrives.txt"
-SET /P RESPONSE="Please enter the installation drive letter: "
-IF "%RESPONSE%"=="" ECHO No drive specified, aborting&& GOTO :erredexit
-REM add trailing colon if only letter entered
-IF "%RESPONSE:~1,1%"=="" SET RESPONSE=%RESPONSE%:
-REM fail if more than 2 chars long
-IF NOT "%RESPONSE:~2%"=="" ECHO Invalid drive %RESPONSE% specified, aborting&& GOTO :erredexit
-FOR %%i in (%VALIDDRIVES%) DO IF /I "%RESPONSE%"=="%%i" SET DRIVE=%%i
-IF "%DRIVE%"=="" ECHO Invalid drive specified, aborting>&2 && GOTO :erredexit
-ECHO   %DRIVE% selected
-
-:skipselection
-REM Get ready
+IF NOT EXIST "%~dp0fart.exe" SET FATALERR=y & ECHO Can't locate fart.exe, obtain this from SourceForge>&2
+IF NOT EXIST "%~dp0syslinux.exe" SET FATALERR=y & ECHO Can't locate syslinux.exe, obtain this by extracting from the latest syslinux     release at kernel.org>&2
+IF NOT EXIST "%~dp0bootcd.iso" SET FATALERR=y & ECHO Can't locate bootcd.iso>&2
+REM end if there was a fatal error
+IF "%FATALERR%" NEQ "" ECHO Aborting, for help run without parameters>&2&GOTO :erredexit
+REM check that we have administrator privileges, this is a kludge but it works...
+IF EXIST "%windir%\system32\%~nx0-test\nul" RMDIR "%windir%\system32\%~nx0-test"
+MKDIR "%windir%\system32\%~nx0-test" 2>nul
+IF ERRORLEVEL 1 ECHO This must be run as administrator & GOTO :erredexit
+RMDIR "%windir%\system32\%~nx0-test"
 REM start with a clean %TEMP%\boot directory
 RMDIR /S /Q "%TEMP%\boot\" 2>nul
 MKDIR "%TEMP%\boot\" 2>nul
+
 REM extract 3 small files immediately - we need them later anyway, 
 REM getting them now allows us to extract DL version
 "%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%\boot" DEVIL-LINUX LICENSE isolinux.cfg>nul
@@ -129,7 +79,7 @@
 REN "%TEMP%\boot\isolinux.cfg" syslinux.cfg
 IF ERRORLEVEL 1 GOTO :erred
 SET /P DLVER=""<"%TEMP%\boot\DEVIL-LINUX"
-ECHO.
+
 ECHO This will make %DRIVE% into Devil-Linux %DLVER% boot disk
 ECHO Please choose configuration:
 ECHO   [1] Clean installation
@@ -139,11 +89,13 @@
 ECHO   [3] Remote-boot configuration on boot partition.
 ECHO       - allows immediate remote ssh login for user 'root' with password 'devil'
 ECHO         and suitable for headless machine or remote installation
-SET /P CONFIGOPT="Please enter 1,2 or 3: "
-IF "%CONFIGOPT%" NEQ "1" IF "%CONFIGOPT%" NEQ "2" IF "%CONFIGOPT%" NEQ "3" (
-	ECHO Invalid response, aborting...
-	GOTO :erredexit
-)
+ECHO   [h] Help information only
+SET /P CONFIGOPT="Please enter 1,2,3 or h (any other key quits): "
+IF /I "%CONFIGOPT%" == "h" GOTO :help
+IF "%CONFIGOPT%" == "1" SET CONFIG=clean installation
+IF "%CONFIGOPT%" == "2" SET CONFIG=pre-saved default configuration
+IF "%CONFIGOPT%" == "3" SET CONFIG=pre-saved remote boot configuration
+IF "%CONFIG%" == "" ECHO Aborting...&GOTO :erredexit
 
 REM Preparatory Action
 ECHO.
@@ -151,28 +103,30 @@
 REM despite the no recurse instruction, it recurses anyway, but we won't use the subdirectories
 "%ZIPEXE%" x "%~dp0bootcd.iso" -o"%TEMP%" boot -r->nul
 IF ERRORLEVEL 1 GOTO :erred
+
 REM extract default configuration
 IF %CONFIGOPT% GEQ 2 "%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%"\boot config\etc-mods.tar.bz2 -r->nul
 IF ERRORLEVEL 1 GOTO :erred
 IF %CONFIGOPT% LEQ 2 GOTO :skip_mod_config
+
 REM create easy remote start configuration
 ECHO Creating Remote-boot configuration
 REM extract default configuration file
 "%ZIPEXE%" e "%TEMP%\boot\etc-mods.tar.bz2" -o"%TEMP%"\boot\config * -r->nul
-IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar.bz2&&GOTO :erred
+IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar.bz2>&2&&GOTO :erred
 REM unpack default configuration
 "%ZIPEXE%" x "%TEMP%\boot\config\etc-mods.tar" -o"%TEMP%\boot\config" * -r->nul
-IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar&&GOTO :erred
+IF ERRORLEVEL 1 ECHO Error extracting etc-mods.tar>&2&&GOTO :erred
 REM extract default shadow (password) file
 "%ZIPEXE%" e "%~dp0bootcd.iso" -o"%TEMP%"\boot\config\etc-mods etc-cd\shadow -r->nul
-IF ERRORLEVEL 1 ECHO Error extracting shadow&&GOTO :erred
+IF ERRORLEVEL 1 ECHO Error extracting shadow>&2&&GOTO :erred
 PUSHD "%TEMP%\boot\config"
 REM switch on sshd
 "%~dp0fart.exe" -q -- "etc-mods\sysconfig\config" "START_SSHD=no" "START_SSHD=yes"
-IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set SSHD to operate at start-up&&GOTO :erred
+IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set SSHD to operate at start-up>&2&&GOTO :erred
 REM set 'devil' password
 "%~dp0fart.exe" -q -- "etc-mods\shadow" "$1$JHH/CiJE$nDKJJh2hEmE8x2VePkyVP/" "$1$Jrgbm29u$TzBgorXoLccnRS23WWvq10"
-IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set root password&&GOTO :erred
+IF "%ERRORLEVEL%" NEQ "1" ECHO Unable to set root password>&2&&GOTO :erred
 REM create autoselect eth0 dhcp network
 MKDIR "etc-mods\sysconfig\nic\">nul
 ECHO DEVICE=eth0>etc-mods\sysconfig\nic\ifcfg-eth0
@@ -208,30 +162,28 @@
 IF /I "%RESPONSE%" NEQ "y" GOTO :erredexit
 SET /P RESPONSE="Last chance - are you really happy to lose everything on %DRIVE%? [y/n] "
 IF /I "%RESPONSE%" NEQ "y" GOTO :erredexit
-ECHO Formatting %DRIVE%
+
+SET /P "dummyvar=Formatting %DRIVE%... "<nul
 ECHO y|FORMAT %DRIVE% /Q /X /FS:FAT32 /V:DEVIL-LINUX>nul
+
 REM if formatting fails, try with FAT16
 IF ERRORLEVEL 1 ECHO y|FORMAT %DRIVE% /Q /X /FS:FAT /V:DEVIL-LINUX>nul
-IF ERRORLEVEL 1 ECHO Unable to format %DRIVE%&&GOTO :erred
-REM check drive size
-REM create dummy file so that dir reports free bytes
-ECHO x>%DRIVE%\syslinux.cfg
-SET DSIZE=0
-FOR /F "tokens=3" %%I IN ('DIR %DRIVE%\ /-c') DO SET DSIZE=%%I
-IF %DSIZE% LSS %REQDSIZE% (
-	ECHO Drive %DRIVE% is not large enough, minimum size is %REQDSIZEMB%MB
-	ECHO Routine aborted...
-	GOTO :erredexit
-)
-ECHO Installing Syslinux MBR and BootSector on %DRIVE%
+IF ERRORLEVEL 1 ECHO Unable to format %DRIVE%>&2&&GOTO :erred
+ECHO done
+CHKDSK %DRIVE%>NUL
+IF ERRORLEVEL 1 CHKDSK %DRIVE%&GOTO :erredexit
+
+SET /P "dummyvar=Installing Syslinux MBR and BootSector on %DRIVE%... "<nul
 "%~dp0syslinux" -ma %DRIVE%
 IF ERRORLEVEL 1 GOTO :erred
+ECHO done
 
 SET /P "dummyvar=Copying files to %DRIVE%, may take a few minutes"<nul
 REM xcopy does not work to USB drive under Vista, and we don't need the subdirectories anyway
 COPY "%TEMP%\boot" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
 SET /P "dummyvar=."<nul
+
 REM for ease of maintenance put usb-install files on USB too
 COPY "%~dp0*usb*" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
@@ -239,44 +191,79 @@
 COPY "%~dp0*.exe" %DRIVE%\>nul
 IF ERRORLEVEL 1 GOTO :erred
 SET /P "dummyvar=."<nul
-REM put bootcd.iso file on drive, pcopy provides progress indicator
-Call :Pcopy "%~dp0bootcd.iso" %DRIVE%
-IF ERRORLEVEL 1 GOTO :erred
+
+REM put bootcd.iso file on drive, CopyWithProgress provides progress indicator
+Call :CopyWithProgress "%~dp0bootcd.iso" %DRIVE%
+IF ERRORLEVEL 1 (
+	REM if CopyWithProgress failed then try with an ordinary COPY
+	ECHO.
+	ECHO Copying large file: bootcd.iso, PLEASE BE PATIENT...
+	copy "%~dp0bootcd.iso" %DRIVE%
+	IF ERRORLEVEL 1 GOTO :erred
+) ELSE (
+	ECHO . done
+)
+
+SET /P "dummyvar=Deleting temporary files.."<nul
+RMDIR /S /Q "%TEMP%\boot" 2>nul
+DEL "%TEMP%\%~n0-*" 2>nul
 ECHO . done
-RMDIR /S /Q "%TEMP%\boot"
-DEL "%TEMP%\%~n0-*"
-ECHO Completed successfully, %DRIVE% now contains bootable Devil-Linux %DLVER%.
-PAUSE
-GOTO :EOF
+
+REM Checking the drive
+ECHO.
+ECHO Drive %DRIVE% prepared:
+CHKDSK %DRIVE%
+IF %ERRORLEVEL% NEQ 0 GOTO :erred
+
+ECHO.
+ECHO Success! %DRIVE% contains bootable Devil-Linux %DLVER% with %CONFIG%.
+GOTO :end
+
+:CopyWithProgress
+:: Copy, displaying progress dots
+SETLOCAL ENABLEDELAYEDEXPANSION
+SET Flagfile=%TEMP%\%RANDOM%.tmp
+IF EXIST %Flagfile% DEL %Flagfile%
+START /MIN COPY %* ^& ECHO.^>%Flagfile% ^& EXIT
+SET LOOP=0
 :Pcopy
-Set Flagfile=%TEMP%.\%RANDOM%.tmp
-If Exist %Flagfile% Del %Flagfile%
-Start /Min Copy %* ^& Echo.^>%Flagfile% ^& Exit
-REM (Set /P i=Copying %1) < NUL
-:Pcopy1
-If Exist %Flagfile% (Goto :EOF)
-::Echo period w/o carriage return/line feed
-(Set /P dummyvar=.) < NUL
+IF EXIST %Flagfile% Goto :EOF
+::Show a period
+REM SET /P dummyvar=!LOOP!<NUL
+SET /P dummyvar=.<NUL
 ::Wait c.3 secs
-Ping -n 6 127.0.0.1 > NUL
-Goto Pcopy1
+ping -n 6 localhost > NUL
+::Loop counter should not exceed 100 i.e. c.5 minutes
+SET /A LOOP=!LOOP!+1
+IF %LOOP% GTR 100 EXIT /B 1
+GOTO Pcopy
+
 :erred
-ECHO.
+ECHO.>&2
 ECHO Error %ERRORLEVEL% occurred, routine aborted...>&2
+
 :erredexit
-ECHO %~nx0 has ended.
+ECHO %~nx0 has ended.>&2
 PAUSE
 RMDIR /S /Q "%TEMP%\boot\" 2>nul
 DEL "%TEMP%\%~n0-*" 2>nul
 EXIT /B 1
+
 :help
-ECHO Usage       : %~nx0 [7z.exe-location]
+ECHO This formats and provisions a USB drive as a Devil-Linux boot disk.
+ECHO.
+ECHO Usage       : %~nx0 DRIVE:[\] [7z.exe-location]
 ECHO Dependencies: 7-Zip, syslinux.exe (32bit), fart.exe
 ECHO Tested on   : Windows XP / Vista / 7 32/64-bit
 ECHO.
-ECHO Notes       : You are prompted before changes are committed to USB drive.
+ECHO Notes       : Easy start - drag'n'drop USB drive onto %~nx0.
+ECHO               Must be run as administrator / with admin privleges
+ECHO               You are prompted before changes are committed to USB drive.
+ECHO               The USB drive cannot be drive C:
 ECHO               1st or only partition of USB drive is (re)formatted, but any
 ECHO                 existing 2nd partition on USB drive (e.g. holding existing DL
 ECHO                 configuration) is not changed.
 ECHO               7z.exe-location does not normally need to be specified.
+ECHO.
+:end
 PAUSE
\ No newline at end of file

[Devil-linux-commit] build CHANGES,1.1413,1.1414

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3106

Modified Files:
	CHANGES 
Log Message:
- updated install-on-usb.bat (Dominic Raferd / HZ)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -d -r1.1413 -r1.1414
--- CHANGES	2 Nov 2010 17:13:14 -0000	1.1413
+++ CHANGES	4 Nov 2010 18:10:12 -0000	1.1414
@@ -22,6 +22,7 @@
 #
 
 1.4RC7
+- updated install-on-usb.bat (Dominic Raferd / HZ)
 - updated gradm to 2.2.0-201010311752
 - updated grsecurity to 2.2.0-2.6.32.25-201010311944
 - updated kernel to 2.6.32.25

[Devil-linux-commit] build/scripts/scripts upgrade-config, 1.41, 1.42

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8823

Modified Files:
	upgrade-config 
Log Message:

- added check for the empty "ROUTE" statement


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- upgrade-config	7 Sep 2010 19:54:33 -0000	1.41
+++ upgrade-config	4 Nov 2010 07:06:54 -0000	1.42
@@ -355,31 +355,34 @@
 	unset ROUTE net gw
 	eval $line
 
-	if  echo $ROUTE | grep "via\|dev" > /dev/null 2>&1; then echo $line; continue ; fi
-	
-	if echo $ROUTE | grep ":" > /dev/null 2>&1; then
-	       net=$(echo $ROUTE | cut -d':' -f1)
-	       gw=$(echo $ROUTE | cut -d':' -f2)
-	else
-	       net=$(echo $ROUTE) # to remove spaces
-	fi
-	
-	#echo $net $gw $dev
-	
-	# fixes
-	if echo $net | grep default > /dev/null 2>&1; then 
-		net="default"; 
-	fi
-	
-	if [ x"$gw" == "x" ]; then 
-		dev="dev \$DEVICE";
-	else 
-		gw="via $gw"; 
-	fi
-	if [ -n "$gw" ]; then
-	    echo "ROUTE=\"$net $gw\"";
-	else
-	    echo "ROUTE=\"$net $dev\"";
+	if [ -n "$ROUTE" ]; then
+
+		if  echo $ROUTE | grep "via\|dev" > /dev/null 2>&1; then echo $line; continue ; fi
+		
+		if echo $ROUTE | grep ":" > /dev/null 2>&1; then
+		       net=$(echo $ROUTE | cut -d':' -f1)
+		       gw=$(echo $ROUTE | cut -d':' -f2)
+		else
+		       net=$(echo $ROUTE) # to remove spaces
+		fi
+		
+		#echo $net $gw $dev
+		
+		# fixes
+		if echo $net | grep default > /dev/null 2>&1; then 
+			net="default"; 
+		fi
+		
+		if [ x"$gw" == "x" ]; then 
+			dev="dev \$DEVICE";
+		else 
+			gw="via $gw"; 
+		fi
+		if [ -n "$gw" ]; then
+		    echo "ROUTE=\"$net $gw\"";
+		else
+		    echo "ROUTE=\"$net $dev\"";
+		fi
 	fi
   done 
 
@@ -391,7 +394,7 @@
 
   if [ -n "$version" ]; then
   	# conversion from version "x"
-   	# Versions other then '1' was not released yet"
+   	# Versions other than '1' was not released yet"
    	continue
   else
   	cp $iface $iface.conversion 

[Devil-linux-commit] build/scripts fwlogwatch,1.11,1.12

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv863/scripts

Modified Files:
	fwlogwatch 
Log Message:
- updated gradm to 2.2.0-201010311752
- updated grsecurity to 2.2.0-2.6.32.25-201010311944
- updated kernel to 2.6.32.25
- updated clamav to 0.96.4
- updated curl to 7.21.2
- updated cyrus-imapd to 2.4.2
- updated dovecot to 1.2.15
- updated fwlogwatch to 1.2
- updated gnupg to 1.4.11
- updated hdparm to 9.35
- updated jailkit to 2.13
- updated lftp to 4.0.10
- updated mysql to 5.1.51
- updated sysstat to 9.1.5


Index: fwlogwatch
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/fwlogwatch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fwlogwatch	6 Jan 2010 14:53:27 -0000	1.11
+++ fwlogwatch	2 Nov 2010 17:13:15 -0000	1.12
@@ -26,13 +26,7 @@
 
 	install )
 		if [ "$CONFIG_FWLOGWATCH" = "y" ]; then
-			mkdir -p $CDDIR/usr/sbin
-			cp -dp fwlogwatch $CDDIR/usr/sbin || exit 1
-			cp -dp contrib/fwlw_notify $CDDIR/usr/sbin || exit 1
-			cp -dp contrib/fwlw_respond $CDDIR/usr/sbin || exit 1
-			cp -dp fwlogwatch.config $ETCDIR/etc || exit 1
-			cp -dp fwlogwatch.template $ETCDIR/etc || exit 1
-			copy_man
+			make install install-config CONF_DIR=$ETCDIR/etc INSTALL_DIR=$CDDIR/usr || exit 1
 		fi
 		;;
 

[Devil-linux-commit] build CHANGES, 1.1412, 1.1413 md5sum.lst, 1.599, 1.600

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv863

Modified Files:
	CHANGES md5sum.lst 
Log Message:
- updated gradm to 2.2.0-201010311752
- updated grsecurity to 2.2.0-2.6.32.25-201010311944
- updated kernel to 2.6.32.25
- updated clamav to 0.96.4
- updated curl to 7.21.2
- updated cyrus-imapd to 2.4.2
- updated dovecot to 1.2.15
- updated fwlogwatch to 1.2
- updated gnupg to 1.4.11
- updated hdparm to 9.35
- updated jailkit to 2.13
- updated lftp to 4.0.10
- updated mysql to 5.1.51
- updated sysstat to 9.1.5


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1412
retrieving revision 1.1413
diff -u -d -r1.1412 -r1.1413
--- CHANGES	3 Oct 2010 14:18:18 -0000	1.1412
+++ CHANGES	2 Nov 2010 17:13:14 -0000	1.1413
@@ -22,6 +22,20 @@
 #
 
 1.4RC7
+- updated gradm to 2.2.0-201010311752
+- updated grsecurity to 2.2.0-2.6.32.25-201010311944
+- updated kernel to 2.6.32.25
+- updated clamav to 0.96.4
+- updated curl to 7.21.2
+- updated cyrus-imapd to 2.4.2
+- updated dovecot to 1.2.15
+- updated fwlogwatch to 1.2
+- updated gnupg to 1.4.11
+- updated hdparm to 9.35
+- updated jailkit to 2.13
+- updated lftp to 4.0.10
+- updated mysql to 5.1.51
+- updated sysstat to 9.1.5
 - mysql init scrit now creates missing tmp directory on initial db creation
 
 1.4RC6

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -d -r1.599 -r1.600
--- md5sum.lst	2 Oct 2010 21:51:30 -0000	1.599
+++ md5sum.lst	2 Nov 2010 17:13:14 -0000	1.600
@@ -55,7 +55,7 @@
 5187ba11b2ec165b6c5b6629087733b0  src/cgilib_0.5.orig.tar.gz
 376ee0327bb6060a03052cdc71bb371f  src/chpax-0.6.tar.gz
 86e339c076b969a1a6bd65b0bfa347bd  src/cipe-1.6.0.tar.gz
-a2c2555d86868f91a01d0e2c2403bbec  src/clamav-0.96.2.tar.gz
+7d47f73fe16b96544a4b5e41686e5060  src/clamav-0.96.4.tar.gz
 b8c0c7fbe0ef5e06e0c935f134304d44  src/clearsilver-0.10.5.tar.gz
 0c030b9eb8f0d36daae5a32b8920dfd0  src/compartment-1.2-suse-patches.diff.bz2
 2df15081f6475e6331cdd813f9d0918c  src/compartment-1.2.tar.bz2
@@ -74,10 +74,10 @@
 c3331c0509e5f1e1ce26502d8be0c70b  src/cron-4.1.tar.bz2
 f3928c1f1d49fcee39bb1e8d42fe707a  src/cryptsetup-1.1.2.tar.bz2
 c00f82ecdcc357434731913e5b48630d  src/ctags-5.8.tar.gz
-eafde5b933bce1c1dca82d1054c8d967  src/curl-7.21.1.tar.bz2
+ca96df88e044c7c25d19692ec8b250b2  src/curl-7.21.2.tar.bz2
 50093db9b64277643969ee75b83ebbd1  src/cutter-1.03.tgz
 956ab476ce276c2d19d583e227dbdbea  src/cvs-1.12.13.tar.bz2
-d89cb1b55023188938f332b7ef120fae  src/cyrus-imapd-2.3.15.tar.gz
+dd67921a4e3e3ef75465ba97c75ed717  src/cyrus-imapd-2.4.2.tar.gz
 2eb0e48106f0e9cd8001e654f267ecbc  src/cyrus-sasl-2.1.23.tar.gz
 c3effff791f4f1386d00a6a68722a688  src/daemontools-0.76.errno.patch.bz2
 0b4c4417aa149c4523a071647ad6778f  src/daemontools-0.76.tar.gz
@@ -144,7 +144,7 @@
 ca3f1990522815ccd0a78e9de3afad43  src/freeramdisk.tar.gz
 d76233108aca9c9606cdbd341562ad9a  src/freetype-2.3.9.tar.bz2
 d30c35b9820d706ff2f9a6ab3b501247  src/frox-0.7.18.tar.bz2
-266974c417a7b973d3e54b64f95e9536  src/fwlogwatch-1.1.tar.bz2
+3dc99583119473ae7a36a8fd660b8e53  src/fwlogwatch-1.2.tar.bz2
 674cc5875714315c490b26293d36dfcf  src/gawk-3.1.7.tar.bz2
 f5897d6f91a4c803b1afef8947af01b3  src/gcc-4.1.2-fortify_source-2.patch.bz2
 79c49b6ae228a2026497408c2d288a34  src/gcc-4.1.2-fpie-2.patch.bz2
@@ -166,19 +166,19 @@
 510853c7951a6b8f28d2600eea5dd168  src/glibc-patches.tar.bz2
 dd60683d7057917e34630b4a787932e8  src/gmp-4.3.2.tar.bz2
 edf00e36f471dd4461829a2286310b7c  src/gnugk-2.3.2.tar.gz
-dcf7ed712997888d616e029637bfc303  src/gnupg-1.4.10.tar.bz2
+411744e1ef8ce90b87938c4203f001f1  src/gnupg-1.4.11.tar.bz2
 e3b2788b79bfc82acbe717e3c54d4e92  src/gnutls-2.8.5.tar.bz2
 f989fe8e24f82d19c8ce55df15784e15  src/gocr-0.43.tar.gz
 c1f1db32fb6598d6a93e6e88796a8632  src/gperf-3.0.4.tar.gz
 6b534da16dc1b28ba828dea89e520f6f  src/gpm-1.20.6.tar.bz2
-97d5b55e38dc5db8906dffa2b9335032  src/gradm-2.2.0-201009022049.tar.gz
+748e32e6528be38efca6163246a9f7ca  src/gradm-2.2.0-201010311752.tar.gz
 3095b57837b312f087c0680559de7f13  src/grep-2.6.3.tar.gz
 b2151714de0c8d31d864fc7b7b9fcb3a  src/groff-1.20.1-badchar.patch.bz2
 48fa768dd6fdeb7968041dd5ae8e2b02  src/groff-1.20.1.tar.gz
-48be8f0440e4577c760a70134c0b1f8f  src/grsecurity-2.2.0-2.6.32.23-201009272133.patch.bz2
+829ec35c45cf477a5bde040c9688681c  src/grsecurity-2.2.0-2.6.32.25-201010311944.patch.bz2
 cd3f3eb54446be6003156158d51f4884  src/grub-0.97.tar.gz
 c54a31b93e865f6a4410b2dc64662706  src/gzip-1.3.13.tar.gz
-b4cc528afb1db7c35e3701d2d96012b2  src/hdparm-9.30.tar.gz
+520996cc36b69212c3907df351296702  src/hdparm-9.35.tar.gz
 2e53a9996beb1ff7611d3f7300586951  src/heartbeat-2.1.4.tar.bz2
 6e5028077e2a6b101a4a72801ba71b9e  src/heimdal-1.2.1.tar.gz
 c7534dc040ab90218257a78488ecd378  src/hostap-driver-0.4.9.tar.gz
@@ -219,7 +219,7 @@
 26def2016548edeafe383113f0bc8ac6  src/isapnptools-1.26.tgz
 6e5e641b832d420e030d5efb59eca7ce  src/iscsitarget-1.4.20.1.tar.gz
 812c0fe189b86d3a8807b31e0c3ad3a2  src/j2re-1_4_1_02-linux-i586.tar.bz2
-263c6b7b86cf1323d69ca26b6b9f7556  src/jailkit-2.11.tar.bz2
+c419c1feefae2a5e64674822a87ce89b  src/jailkit-2.13.tar.bz2
 14ad3a2eb26e55ef34ac0569f5739ccc  src/jfsutils-1.1.13.tar.gz
 1053186ac3939dc4e709a8ba175c4fbc  src/jftpgw-0.13.5.tar.bz2
 66de1b073e869ba12abbfcde3885c577  src/joe-3.7.tar.gz
@@ -235,7 +235,7 @@
 ca68eb7c3e6b33d11cd2a3d325a1a4b5  src/l7filter_iptables-1.4.3.patch.bz2
 dbc53fc94ae725ca5944b7a94ed52f8b  src/lcd4linux-0.10.1-RC1.tar.gz
 817bf051953ad2dea825a1cdf460caa4  src/less-436.tar.gz
-73ea519c9e9cdfa47b714c5c91093a0d  src/lftp-4.0.5.tar.gz
+028f14ef845403e6f76acb41f51e908c  src/lftp-4.0.10.tar.bz2
 5aa3b0d29b27b7a3e1d80962c94f54cb  src/lha_1.14i-5.diff.gz
 10410742b0169f3357ef9a3f0f032037  src/lha_1.14i.orig.tar.gz
 8d8730995b48ac51d0bafd4b60077a21  src/libHX-2.5.tar.bz2
@@ -317,7 +317,7 @@
 f7c1f873e68e7176f60ae9fbb2ca20f4  src/mtr-0.79.tar.gz
 ce8f0e44671fb0c7d9ec30bb0bfa8b5c  src/mtx-1.3.12.tar.gz
 6f8c59cc214dbffd555085b1db7272c1  src/mxser.tgz
-23bac4a0aafd683b077dac146ce2701f  src/mysql-5.1.50.tar.gz
+c12bf24493688c51c6cff5e8c6563830  src/mysql-5.1.51.tar.gz
 900e3f4164f4b2a18485420eeaefe812  src/nagios-3.0.6.tar.gz
 7c1a5cad155dc92a257214c0b67eda63  src/nagios-plugin-pgsql_include_for_8.3.patch.bz2
 be6cc7699fff3ee29d1fd4d562377386  src/nagios-plugins-1.4.13.tar.gz
@@ -369,7 +369,7 @@
 e6f90c8e57e236d45626d479feca2dc4  src/pam_otp_auth-3.2.2.tar.gz
 a5d27ccbaaad9d9fb254b01a3c12bd06  src/pam_radius-1.3.17.tar.gz
 9c262afd6673d7724a60b7c632ce80fa  src/parted-2.2.tar.gz
-6eac9aebbf9e74546b7c44c0fb9348a7  src/patch-2.6.32.23.bz2
+d8fff54efff6c5f7b07e5370a5e9f119  src/patch-2.6.32.25.bz2
 289248c80d96184a902ffac1db56543f  src/patch-o-matic-ng-20090819.tar.bz2
 ad241429bf352d1b55493153f2eaae2f  src/pax-linux-2.6.32.10-test27.patch.bz2
 acf0e368cb33bc2f6a335ba3f5e4fd2b  src/pax-utils-0.1.15.tar.bz2
@@ -652,7 +652,7 @@
 14e7dcd0436d2f49aa403f67e1ef7ddc  src/sysfsutils-2.1.0.tar.gz
 7a3503098a9d1e3b55b90bec303e66e2  src/syslinux-3.84.tar.bz2
 7107f5758dec4b774136f0f827b35258  src/syslog-ng_3.0.8.tar.gz
-17a7ea3709db754fc567b390cdfafc68  src/sysstat-9.1.4.tar.bz2
+472156951eac54e23778d7b05e469407  src/sysstat-9.1.5.tar.bz2
 7d5d61c026122ab791ac04c8a84db967  src/sysvinit-2.86.tar.gz
 07fa517027f426bb80f5f5ff91b63585  src/tar-1.22.tar.bz2
 1176b5a45e34823ae1d95621449b4baf  src/tcp_wrappers-7.6-gcc34-1.patch.bz2

[Devil-linux-commit] build/scripts/config/linux-2.6 config_grsecurity, 1.25, 1.26

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

Update of /cvsroot/devil-linux/build/scripts/config/linux-2.6
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv863/scripts/config/linux-2.6

Modified Files:
	config_grsecurity 
Log Message:
- updated gradm to 2.2.0-201010311752
- updated grsecurity to 2.2.0-2.6.32.25-201010311944
- updated kernel to 2.6.32.25
- updated clamav to 0.96.4
- updated curl to 7.21.2
- updated cyrus-imapd to 2.4.2
- updated dovecot to 1.2.15
- updated fwlogwatch to 1.2
- updated gnupg to 1.4.11
- updated hdparm to 9.35
- updated jailkit to 2.13
- updated lftp to 4.0.10
- updated mysql to 5.1.51
- updated sysstat to 9.1.5


Index: config_grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_grsecurity,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- config_grsecurity	3 Sep 2010 15:12:20 -0000	1.25
+++ config_grsecurity	2 Nov 2010 17:13:15 -0000	1.26
@@ -140,3 +140,4 @@
 CONFIG_GRKERNSEC_AUDIT_PTRACE=y
 CONFIG_GRKERNSEC_SYSCTL_DISTRO=n
 CONFIG_PAX_ELFRELOCS=y
+CONFIG_NETFILTER_XT_MATCH_GRADM=m

[Devil-linux-commit] build/scripts Pound,1.1,1.2

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1802

Modified Files:
	Pound 
Log Message:

- added missed init script for pound FR#74


Index: Pound
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Pound,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Pound	11 Jul 2010 08:33:36 -0000	1.1
+++ Pound	12 Oct 2010 05:34:40 -0000	1.2
@@ -11,6 +11,8 @@
 # get the directoryname of the script
 MYDIR=${0%/*}
 
+MYNAME=POUND
+
 # source functions and config
 source $MYDIR/settings
 
@@ -30,6 +32,12 @@
 		make install DESTDIR=$TMPDIR/ || exit 1
 		copy_files $TMPDIR/usr $CDDIR/ || exit 1
 		rm -rf $TMPDIR || exit 1
+		cp $MYDIR/scripts/pound $ETCDIR/etc/init.d || exit 1
+
+                echo "# Start $MYNAME?" >> $CONFIGFILE
+                echo "START_$MYNAME=no" >> $CONFIGFILE
+                echo >> $CONFIGFILE 
+                echo "HELP_$MYNAME=\"$MYNAME is a secure revers proxy\"" >> $SOFTWAREHELP
 	    fi
             ;;
         * )

[Devil-linux-commit] build/scripts/scripts pound,NONE,1.1

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1802/scripts

Added Files:
	pound 
Log Message:

- added missed init script for pound FR#74


--- NEW FILE: pound ---
#!/bin/bash
#
# $Source: /cvsroot/devil-linux/build/scripts/scripts/pound,v $
# $Revision: 1.1 $
# $Date: 2010/10/12 05:34:40 $
#
# http://www.devil-linux.org
#

### BEGIN INIT INFO
# Provides:       pound
# Required-Start: $network $syslog $named
# Required-Stop:  $network $syslog $named
# Default-Start:  3 5
# Default-Stop:   6 0
# Description:    starts the pound daemon (secure revers proxy)
### END INIT INFO

# settings
source /etc/sysconfig/config

# parameters
NAME="Pound"
CONFIGNAME=POUND
DAEMON=/usr/sbin/pound
PARAMETER="/etc/pound.conf"

# source function library
source /etc/init.d/functions

eval START=\$START_$CONFIGNAME

# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}

# Force execution if not called by a runlevel directory.
test $link = $base && START=yes
test "$START" = "yes" || exit 0

if [ ! -e $DAEMON ]; then
		echo
	echo "$DAEMON not found. Did you install the package?"
	exit 1
fi

case "$1" in
	start)
		echo -n "Starting $NAME: "
		loadproc $DAEMON -f $PARAMETER
		;;
	stop)
		echo -n "Shutting down $NAME: "
		killproc $DAEMON
		;;
	restart)
		$0 stop
		sleep 1
		$0 start
		;;
	*)
		echo "Usage: $0 {start|stop|restart}"
		exit 1
		;;
esac

[Devil-linux-commit] build/scripts/scripts save-config,1.44,1.45

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30171

Modified Files:
	save-config 
Log Message:

- it's better to rely on kernel instead of udev. 
 In this case we can use not only local partitions (udev), but any block device - drbd, aoe etc (loopbacks are filtered out).



Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- save-config	22 Aug 2010 09:27:59 -0000	1.44
+++ save-config	9 Oct 2010 19:49:01 -0000	1.45
@@ -103,7 +103,8 @@
     else
 
         # generate the device list we need to search for the configuration information
-        PARTITIONS=`for i in /dev/disk/by-path/*-part* ; do echo "/dev/"$(basename $(readlink $i)) ; done`
+        #PARTITIONS=`for i in /dev/disk/by-path/*-part* ; do echo "/dev/"$(basename $(readlink $i)) ; done`
+	PARTITIONS=`for i in $(grep -v "loop\|name\|^$" /proc/partitions | awk '{print $4}'); do echo "/dev/$i" ; done`
         FLOPPIES=`find /dev/floppy/ -name "?" 2> /dev/null`
         CONFIG_SRC_LIST="$PARTITIONS $FLOPPIES"
 

[Devil-linux-commit] build CHANGES,1.1411,1.1412

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29303

Modified Files:
	CHANGES 
Log Message:
- mysql init scrit now creates missing tmp directory on initial db creation
- bumped up version #


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1411
retrieving revision 1.1412
diff -u -d -r1.1411 -r1.1412
--- CHANGES	2 Oct 2010 19:35:23 -0000	1.1411
+++ CHANGES	3 Oct 2010 14:18:18 -0000	1.1412
@@ -21,6 +21,9 @@
 #
 #
 
+1.4RC7
+- mysql init scrit now creates missing tmp directory on initial db creation
+
 1.4RC6
 - updated xtables-addons to 1.29
 - added missing mod_perl perl modules

[Devil-linux-commit] build/scripts/scripts mysqld,1.14,1.15

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

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29303/scripts/scripts

Modified Files:
	mysqld 
Log Message:
- mysql init scrit now creates missing tmp directory on initial db creation
- bumped up version #


Index: mysqld
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/mysqld,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mysqld	28 Jun 2009 22:02:05 -0000	1.14
+++ mysqld	3 Oct 2010 14:18:18 -0000	1.15
@@ -51,7 +51,7 @@
 			[ ! -e ${DATADIR:-/var/mysql} ] && mkdir -p ${DATADIR:-/var/mysql}
 			if [ ! -d ${DATADIR:-/var/mysql}/mysql ] || [ $(ls -1 ${DATADIR:-/var/mysql} 2> /dev/null | wc -l) -eq 0 ] ; then
 				echo "Initializing new $NAME data dir: "
-				mkdir ${DATADIR:-/var/mysql}/mysql ${DATADIR:-/var/mysql}/test
+				mkdir ${DATADIR:-/var/mysql}/mysql ${DATADIR:-/var/mysql}/test ${DATADIR:-/var/mysql}/tmp
 				chown -R mysql:mysql ${DATADIR:-/var/mysql}
 				mysql_install_db $MYSQL_PARM
 			fi

[Devil-linux-commit] build/scripts/config VERSION,1.28,1.29

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

Update of /cvsroot/devil-linux/build/scripts/config
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29303/scripts/config

Modified Files:
	VERSION 
Log Message:
- mysql init scrit now creates missing tmp directory on initial db creation
- bumped up version #


Index: VERSION
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/VERSION,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- VERSION	28 Sep 2010 13:11:24 -0000	1.28
+++ VERSION	3 Oct 2010 14:18:18 -0000	1.29
@@ -1 +1 @@
-1.4RC6
+1.4RC7

[Devil-linux-commit] build md5sum.lst,1.598,1.599

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10729

Modified Files:
	md5sum.lst 
Log Message:
downgraded dovecot


Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -d -r1.598 -r1.599
--- md5sum.lst	2 Oct 2010 18:33:36 -0000	1.598
+++ md5sum.lst	2 Oct 2010 21:51:30 -0000	1.599
@@ -103,7 +103,7 @@
 b093d7c6bc7f97ae6fd35d048529232a  src/dnsmasq-2.55.tar.gz
 b9b76a6af198c4f44574cfd17a322f01  src/docbook2X-0.8.8.tar.gz
 ae64c11d3963cd49758aba2854a60b6e  src/dosfstools-3.0.6.tar.bz2
-7168c5bf40fdd38cceb99114547699b8  src/dovecot-2.0.5.tar.gz
+15fe307fe85a87cb7a697655dbab29d0  src/dovecot-1.2.15.tar.gz
 3a12dba3a010c79452c5cb26cf4dbde8  src/dovecot_deleted_to_trash-0.3.tar.bz2
 10d092b57d628d8c91655fee5dc0d0cd  src/dspam-3.9.0.tar.gz
 3983baeb199e010920a46d8541de784b  src/dst-11.tar.bz2

[Devil-linux-commit] build/config/etc/init.d beep,1.4,1.5

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

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13114

Modified Files:
	beep 
Log Message:
new beep feature overwrites default behavior
disabling for now so we can get RC6 released


Index: beep
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/beep,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- beep	27 Sep 2010 19:32:50 -0000	1.4
+++ beep	2 Oct 2010 19:37:00 -0000	1.5
@@ -49,14 +49,14 @@
 		echo "Starting $NAME: "
 #		loadproc $DAEMON $PARAMETER
 #		#DL =   -.. .-..
-		if [ "`tty`" = "/dev/console" ]; then
-			# for serial console, force bell sound to local machine
-			for m in {1..3}; do
-				for n in {4..1}; do
-					sleep 0.$n; echo -en "\a">/dev/tty0
-				done
-			done
-		else
+		#if [ "`tty`" = "/dev/console" ]; then
+		#	# for serial console, force bell sound to local machine
+		#	for m in {1..3}; do
+		#		for n in {4..1}; do
+		#			sleep 0.$n; echo -en "\a">/dev/tty0
+		#		done
+		#	done
+		#else
 			beep -f 880  -l 400
 			beep -f 3000 -l 200
 			beep -f 3000 -l 200 -D 600
@@ -64,7 +64,7 @@
 			beep -f 880  -l 400
 			beep -f 3000 -l 200
 			beep -f 3000 -l 200
-		fi
+		#fi
 		;;
 	stop)
 #		echo -n "Shutting down $NAME: "

[Devil-linux-commit] build/scripts dovecot, 1.26, 1.27 dovecot_deleted_to_trash, 1.5, 1.6

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12865/scripts

Modified Files:
	dovecot dovecot_deleted_to_trash 
Log Message:
revert dovecot back to v1.2


Index: dovecot
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dovecot,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dovecot	2 Oct 2010 16:42:46 -0000	1.26
+++ dovecot	2 Oct 2010 19:35:23 -0000	1.27
@@ -32,8 +32,8 @@
 				CONF_OPTIONS="$CONF_OPTIONS --with-sqlite"
 			fi
 
-			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-ssl=openssl \
-			    --with-sql --with-zlib --with-bzlib --with-libcap --enable-shared  $CONF_OPTIONS || exit 1
+			./configure --prefix=/usr --sysconfdir=/etc/dovecot --localstatedir=/var --with-ssl=openssl \
+			    --with-db --with-zlib --with-bzlib --with-libcap --enable-shared --enable-header-install $CONF_OPTIONS || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 			
@@ -61,7 +61,6 @@
 			chmod -R 750  $CDDIR/var/run/dovecot || exit 1
 
 			useradd -u 102 -g nogroup -s /bin/false -c "Dovecot secure IMAP server" dovecot
-			useradd -u 103 -g nogroup -s /bin/false -c "Dovecot secure IMAP server - untrusted" dovenull
 			cp $MYDIR/scripts/dovecot $ETCDIR/etc/init.d || exit 1
 
 			cp $MYDIR/scripts/dovecot.pam $ETCDIR/etc/pam.d/dovecot || exit 1

Index: dovecot_deleted_to_trash
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dovecot_deleted_to_trash,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dovecot_deleted_to_trash	27 Sep 2010 17:52:43 -0000	1.5
+++ dovecot_deleted_to_trash	2 Oct 2010 19:35:23 -0000	1.6
@@ -15,9 +15,6 @@
 
 MYNAME=DOVECOT
 
-# this currently doesn't work with the new dovecot
-exit 0
-
 case $1 in
 	build )
 		if [ "$CONFIG_DOVECOT" = "y" ]; then

[Devil-linux-commit] build CHANGES,1.1410,1.1411

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

Update of /cvsroot/devil-linux/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12865

Modified Files:
	CHANGES 
Log Message:
revert dovecot back to v1.2


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.1410
retrieving revision 1.1411
diff -u -d -r1.1410 -r1.1411
--- CHANGES	2 Oct 2010 18:33:36 -0000	1.1410
+++ CHANGES	2 Oct 2010 19:35:23 -0000	1.1411
@@ -22,7 +22,6 @@
 #
 
 1.4RC6
-- updated dovecot to 2.0.5
 - updated xtables-addons to 1.29
 - added missing mod_perl perl modules
 - added MailScanner-4.81.4-1 (Alberto Benati + Heiko)
@@ -37,7 +36,6 @@
 1.4RC5
 - added install-on-usb.bat for Windows machines (Dominic Raferd / HZ)
 - updated system startup "beeps" to support serial consoles (Dominic Raferd / HZ)
-- updated dovecot to 2.0.4
 - closed bug #86 - missing clamav support in dansguardian
 - enabled email notification for dansguardian
 - increase the maximum number of serial ports from 4 to 16