[Devil-linux-commit] build/scripts dansguardian, 1.3, 1.4 gmp, 1.13, 1.14 lynx, 1.12, 1.13 pkgconfig, 1.7, 1.8 samba, 1.29, 1.30

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

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23794/scripts

Modified Files:
	dansguardian gmp lynx pkgconfig samba 
Log Message:
- updated MailScanner-4.77.10-1
- addedd ajaxterm for webmin
- updated alsa-lib-1.0.21a
- updated cpio-2.10
- updated cpqarrayd-2.3
- updated ctags-5.8
- updated curl-7.19.6
- updated cutter-1.03
- updated cyrus-imapd-2.3.15
- updated dansguardian-2.10.1.1
- updated dbus-1.2.16
- updated dcc-1.3.115
- updated dkim-milter-2.8.3
- updated fetchmail-6.3.11
- updated findutils-4.2.33
- updated gifsicle-1.55
- updated heimdal-1.2.1
- updated httpd-2.2.13
- updated jftpgw-0.13.5
- updated lftp-3.7.15
- updated libprngwrap-1.0.2
- updated lsof_4.82
- updated lynx2.8.7
- updated mcrypt-2.6.8
- updated memcached-1.2.8
- updated mysql-5.1.38
- updated openldap-2.4.18
- updated openvpn-2.1_rc19
- updated openvpn-2.5 webmin module
- updated postgresql-8.3.8
- updated samba-3.4.1
- updated xfsprogs-3.0.3


Index: gmp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gmp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gmp	26 Dec 2007 15:54:23 -0000	1.13
+++ gmp	11 Sep 2009 15:27:15 -0000	1.14
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       gmp
-# Required-Start: $basebuildtools glibc
+# Required-Start: $basebuildtools glibc libiconv
 # Required-Stop:
 # Default-Start:  1
 # Default-Stop:

Index: samba
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/samba,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- samba	7 Jan 2009 06:10:57 -0000	1.29
+++ samba	11 Sep 2009 15:27:15 -0000	1.30
@@ -28,12 +28,13 @@
 case $1 in
     build )
 	if [ "$CONFIG_SAMBA" = "y" ]; then
-		cd source
+		cd source3 || exit 1
 		./configure --prefix=/usr --localstatedir=/var --with-configdir=/etc/samba --with-privatedir=/etc/samba --with-lockdir=/var/lock/samba \
 			--with-ldapsam \
 			--with-fhs --with-smbmount --with-libsmbclient --with-ssl --with-syslog --with-utmp --with-msdfs \
 			--with-acl-support --with-winbind --with-quotas --with-vfs --with-smbwrapper \
-			--with-logfilebase=/var/log --with-swatdir=/usr/share/samba/swat --with-krb5=/usr/include || exit 1
+			--with-logfilebase=/var/log --with-swatdir=/usr/share/samba/swat --with-krb5=/usr/include \
+			--enable-nss-wrapper --enable-socket-wrapper --with-pam --with-pam_smbpass  || exit 1
 		make proto || exit 1
 		make $PMAKE || exit 1
 		strip_debug
@@ -42,11 +43,11 @@
 
     install )
 	if [ "$CONFIG_SAMBA" = "y" ]; then
-		cd source
+		cd source3
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR/usr/{bin,sbin,lib,share} || exit 1
 		mkdir -p $TMPDIR/usr/share/samba || exit 1
-		make install DESTDIR=$TMPDIR || exit
+		make install DESTDIR=$TMPDIR || exit 1
 
 		copy_docs $TMPDIR
 		rm -rf $TMPDIR/usr/include || exit 1
@@ -60,9 +61,9 @@
 		mkdir -p $CDDIR/lib || exit 1
 		mkdir -p $CDDIR/var/log/samba || exit 1
 
-		cp nsswitch/libnss_winbind.so $CDDIR/lib || exit 1
+		cp ../nsswitch/libnss_winbind.so $CDDIR/lib || exit 1
 		ln -sf libnss_winbind.so $CDDIR/lib/libnss_winbind.so.2 || exit 1
-		cp nsswitch/libnss_wins.so $CDDIR/lib || exit 1
+		cp ../nsswitch/libnss_wins.so $CDDIR/lib || exit 1
 		ln -sf libnss_wins.so $CDDIR/lib/libnss_wins.so.2 || exit 1
 
 		mkdir -p $ETCDIR/etc/samba || exit 1

Index: pkgconfig
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pkgconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pkgconfig	19 Feb 2008 16:27:32 -0000	1.7
+++ pkgconfig	11 Sep 2009 15:27:15 -0000	1.8
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       pkgconfig
-# Required-Start: $basebuildtools glibc
+# Required-Start: $basebuildtools glibc zlib
 # Required-Stop:
 # Default-Start:  1
 # Default-Stop:

Index: dansguardian
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dansguardian,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dansguardian	13 Jun 2006 17:52:37 -0000	1.3
+++ dansguardian	11 Sep 2009 15:27:15 -0000	1.4
@@ -18,6 +18,7 @@
 ### END INIT INFO
 
 # get the directoryname of the script
+MYNAME=DANSGUARDIAN
 MYDIR=${0%/*}
 
 # source functions and config
@@ -26,7 +27,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_DANSGUARDIAN" = "y" ]; then
-	    ./configure --runas_grp=nogroup || exit 1
+	    ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1
 	    make $PMAKE all || exit 1
 	    strip_debug
 	fi
@@ -36,15 +37,21 @@
 	if [ "$CONFIG_DANSGUARDIAN" = "y" ]; then
             rm -rf $TMPDIR || exit 1
 	    mkdir $TMPDIR || exit 1
-	    make install INSTALLPREFIX=$TMPDIR || exit 1
+	    make install DESTDIR=$TMPDIR || exit 1
 	    copy_docs $TMPDIR
 	    cp -dpvR $TMPDIR/usr $CDDIR/ || exit 1
 	    cp -dpvR $TMPDIR/var $CDDIR/ || exit 1
-	    mv $TMPDIR/etc/rc.d/init.d/ $TMPDIR/etc/ || exit 1
-	    rmdir $TMPDIR/etc/rc.d/ || exit 1
-	    mkdir -p $CDDIR/config/ || exit 1
-	    tar -C $TMPDIR -cvzf $CDDIR/config/dansguardian-etc.tgz etc/ || exit 1
+	    cp -dpvR $TMPDIR/etc $ETCDIR/ || exit 1
+	    cp $MYDIR/scripts/dansguardian $ETCDIR/etc/init.d || exit 1
+	    mkdir -p $ETCDIR/etc/logrotate.d
+	    cp -dpv $TMPDIR/usr/share/dansguardian/scripts/dansguardian $ETCDIR/etc/logrotate.d/ || exit 1
 	    rm -rf $TMPDIR || exit 1
+
+	    echo "# Start $MYNAME?" >> $CONFIGFILE
+	    echo "START_$MYNAME=no" >> $CONFIGFILE
+	    echo >> $CONFIGFILE
+	    echo "HELP_$MYNAME=\"Web Content Filtering\"" >> $SOFTWAREHELP
+
 	fi
     	;;
 

Index: lynx
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lynx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lynx	12 Dec 2004 21:48:08 -0000	1.12
+++ lynx	11 Sep 2009 15:27:15 -0000	1.13
@@ -40,11 +40,8 @@
 		mkdir -p $TMPDIR || exit 1
 		make install DESTDIR=$TMPDIR || exit 1
 		copy_docs $TMPDIR
-		cp $TMPDIR/usr/lib/lynx.cfg $ETCDIR/etc/ || exit 1
-		rm $TMPDIR/usr/lib/lynx.cfg || exit 1
-		ln -sf /etc/lynx.cfg $TMPDIR/usr/lib/lynx.cfg || exit 1
-		mkdir -p $CDDIR
-		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		cp -dpvR $TMPDIR/etc $ETCDIR/ || exit 1
+		cp -dpvR $TMPDIR/usr $CDDIR/ || exit 1
 		rm -rf $TMPDIR || exit 1
 	fi
 	;;