Menu
▾
▴
devil-linux-commit
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13622 Modified Files: Tag: rel-1-2-patches LVM MOSIX Mail-SpamAssassin alsa-driver alsa-lib alsa-utils alsaplayer apcupsd arpwatch bind bridge-utils bzip2 camsource cd_cleanup cdrtools cron cvs dhcp diffutils dnsmasq dovecot ethtool ez-ipupdate fetchmail file findutils frox gcc glibc grep groff grsecurity iANS ipac-ng isapnptools jfsutils jftpgw kbd lcd4linux lftp linux-wlan-ng lm_sensors longhaul lynx make man mc mgetty minicom module-init-tools modutils motion mt-st mtools nail ncftp net-snmp net-tools netacct-mysql nss_ldap ntp oidentd openssl openvpn passwdgen pcmcia-cs php procps psmisc quota-tools radvd raidtools razor-agents rcs reiserfsprogs rpm rsync samba screen sed ser shfs smartmontools squidguard sudo sysstat telnet-bsd tftp-hpa thttpd unionfs unzip usbutils util-linux vim vlan vsftpd vtun watchdog wget wireless_tools wol xmbmon yp-tools ypbind-mt ypserv zip Log Message: make sure we don't screw up 1.3 sources again if we copy scripts between the releases. we need to use $TMPDIR instead of $WORKDIR/tmp Index: camsource =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/camsource,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- camsource 11 Jan 2004 14:43:04 -0000 1.5 +++ camsource 21 Feb 2008 20:34:37 -0000 1.5.2.1 @@ -35,17 +35,17 @@ install ) if [ "$CONFIG_CAMSOURCE" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/bin || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm $WORKDIR/tmp/usr/lib/camsource/*a || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm $TMPDIR/usr/lib/camsource/*a || exit 1 - cp -dp $WORKDIR/tmp/etc/* $ETCDIR/etc || exit 1 + cp -dp $TMPDIR/etc/* $ETCDIR/etc || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $DOCDIR/camsource || exit 1 cp -dp README $DOCDIR/camsource || exit 1 Index: nss_ldap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nss_ldap,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- nss_ldap 9 Mar 2005 02:37:23 -0000 1.1.2.1 +++ nss_ldap 21 Feb 2008 20:34:37 -0000 1.1.2.2 @@ -34,18 +34,18 @@ install ) if [ "$CONFIG_NSSLDAPLIB" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/lib || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - mkdir -p $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/lib || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + mkdir -p $TMPDIR/usr || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + make install DESTDIR=$TMPDIR || exit 1 mkdir -p $CDDIR - copy_files_links $WORKDIR/tmp/lib $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files_links $TMPDIR/lib $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: kbd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kbd,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- kbd 14 Jan 2004 22:41:27 -0000 1.6 +++ kbd 21 Feb 2008 20:34:37 -0000 1.6.2.1 @@ -31,12 +31,12 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man || exit 1 - copy_docs $WORKDIR/tmp - cp -dfpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR DATADIR=$TMPDIR/usr/share/kbd MANDIR=$TMPDIR/usr/share/man || exit 1 + copy_docs $TMPDIR + cp -dfpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: vtun =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vtun,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- vtun 11 Jan 2004 14:43:05 -0000 1.11 +++ vtun 21 Feb 2008 20:34:38 -0000 1.11.2.1 @@ -39,13 +39,13 @@ install ) if [ "$CONFIG_VTUN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/vtun $ETCDIR/etc/init.d || exit 1 echo "# Start vtund?" >> $CONFIGFILE Index: vsftpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/vsftpd,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- vsftpd 2 Dec 2005 13:08:24 -0000 1.11.2.1 +++ vsftpd 21 Feb 2008 20:34:38 -0000 1.11.2.2 @@ -62,7 +62,7 @@ mkdir -p $DOCDIR/vsftpd || exit 1 cp -dpR EXAMPLE $DOCDIR/vsftpd || exit 1 cp -dpR xinetd.d $DOCDIR/vsftpd || exit 1 - #copy_docs $WORKDIR/tmp + #copy_docs $TMPDIR cp vsftpd $CDDIR/usr/sbin || exit 1 cp $MYDIR/scripts/vsftpd $ETCDIR/etc/init.d || exit 1 Index: findutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/findutils,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- findutils 11 Jan 2004 14:43:04 -0000 1.10 +++ findutils 21 Feb 2008 20:34:37 -0000 1.10.2.1 @@ -31,14 +31,14 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr || exit 1 - make install DESTDIR=$WORKDIR/tmp/ || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/libexec || exit 1 - rm -rf $WORKDIR/tmp/usr/info || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/|| exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr || exit 1 + make install DESTDIR=$TMPDIR/ || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/libexec || exit 1 + rm -rf $TMPDIR/usr/info || exit 1 + cp -dpR $TMPDIR/* $CDDIR/|| exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $CDDIR/var/locatedb || exit 1 ;; Index: telnet-bsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/telnet-bsd,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- telnet-bsd 11 Jan 2004 14:43:05 -0000 1.7 +++ telnet-bsd 21 Feb 2008 20:34:38 -0000 1.7.2.1 @@ -42,13 +42,13 @@ install ) if [ "$CONFIG_TELNET_BSD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp SUBDIRS="intl telnet po" || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR SUBDIRS="intl telnet po" || exit 1 + copy_docs $TMPDIR mkdir -p $CDDIR/usr/bin - cp -p $WORKDIR/tmp/usr/bin/telnet $CDDIR/usr/bin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -p $TMPDIR/usr/bin/telnet $CDDIR/usr/bin/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: samba =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/samba,v retrieving revision 1.24.2.4 retrieving revision 1.24.2.5 diff -u -d -r1.24.2.4 -r1.24.2.5 --- samba 1 Oct 2005 14:54:32 -0000 1.24.2.4 +++ samba 21 Feb 2008 20:34:38 -0000 1.24.2.5 @@ -43,23 +43,23 @@ install ) if [ "$CONFIG_SAMBA" = "y" ]; then cd source - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/{bin,sbin,lib,share} || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/samba || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit + 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 - rm -rf $WORKDIR/tmp/sbin/mount.smbfs || exit 1 - ln -sf /usr/bin/smbmount $WORKDIR/tmp/sbin/mount.smbfs || exit 1 + rm -rf $TMPDIR/sbin/mount.smbfs || exit 1 + ln -sf /usr/bin/smbmount $TMPDIR/sbin/mount.smbfs || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/private || exit 1 - copy_files $WORKDIR/tmp/usr/share/samba $CDDIR/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/share/samba || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/private || exit 1 + copy_files $TMPDIR/usr/share/samba $CDDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/share/samba || exit 1 mkdir -p $CDDIR/var/lock/samba || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $CDDIR/lib || exit 1 mkdir -p $CDDIR/var/log/samba || exit 1 Index: thttpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/thttpd,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -d -r1.17 -r1.17.2.1 --- thttpd 11 Jan 2004 14:43:05 -0000 1.17 +++ thttpd 21 Feb 2008 20:34:38 -0000 1.17.2.1 @@ -38,16 +38,16 @@ install ) if [ "$CONFIG_THTTPD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/{sbin,man,www} || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/{sbin,man,www} || exit 1 # install it into build system, because we need it later - make install DESTDIR=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/usr/www || exit 1 - copy_docs $WORKDIR/tmp - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/www || exit 1 + copy_docs $TMPDIR + copy_files $TMPDIR/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/thttpd $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/thttpd.conf $ETCDIR/etc/ || exit 1 Index: openvpn =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openvpn,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- openvpn 5 May 2006 13:57:13 -0000 1.11.2.1 +++ openvpn 21 Feb 2008 20:34:37 -0000 1.11.2.2 @@ -39,14 +39,14 @@ install ) if [ "$CONFIG_OPENVPN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install-strip DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + make install-strip DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR mkdir -p $DOCDIR/openvpn || exit 1 cp -dpR easy-rsa sample-* management plugin contrib debug $DOCDIR/openvpn || exit 1 - copy_files $WORKDIR/tmp/usr/sbin/ $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr/sbin/ $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/openvpn $ETCDIR/etc/init.d || exit 1 echo "# Start openvpn?" >> $CONFIGFILE Index: isapnptools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/isapnptools,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- isapnptools 11 Jan 2004 14:43:04 -0000 1.2 +++ isapnptools 21 Feb 2008 20:34:37 -0000 1.2.2.1 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_ISAPNPTOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/ || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/ || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/usr/sbin/* $CDDIR/usr/sbin/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr/sbin/* $CDDIR/usr/sbin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: lm_sensors =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -d -r1.19 -r1.19.2.1 --- lm_sensors 16 Mar 2004 01:47:03 -0000 1.19 +++ lm_sensors 21 Feb 2008 20:34:37 -0000 1.19.2.1 @@ -71,26 +71,26 @@ install ) if [ "$CONFIG_LM_SENSORS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin || exit 1 EXTRA="" if [ "$CONFIG_RRDTOOL" = "y" ];then EXTRA="PROG_EXTRA:=sensord" fi - make user_install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man $EXTRA || exit 1 + make user_install DESTDIR=$TMPDIR PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man $EXTRA || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR mkdir -p $DOCDIR/lm_sensors || exit 1 cp -dpR doc/* $DOCDIR/lm_sensors || exit 1 - cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 + cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/lm_sensors $ETCDIR/etc/init.d || exit 1 cp $MYDIR/scripts/lm_sensors.example $ETCDIR/etc/sysconfig || exit 1 Index: ethtool =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ethtool,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- ethtool 11 Jan 2004 14:43:04 -0000 1.9 +++ ethtool 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -35,14 +35,14 @@ install ) if [ "$CONFIG_ETHTOOL" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: lftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lftp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- lftp 11 Jan 2004 14:43:04 -0000 1.7 +++ lftp 21 Feb 2008 20:34:37 -0000 1.7.2.1 @@ -35,18 +35,18 @@ install ) if [ "$CONFIG_LFTP" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/bin || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - rm -rf $WORKDIR/tmp/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/lib || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/lib || exit 1 mkdir -p $CDDIR - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: unzip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/unzip,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- unzip 11 Jan 2004 14:43:05 -0000 1.5 +++ unzip 21 Feb 2008 20:34:38 -0000 1.5.2.1 @@ -32,8 +32,8 @@ install ) if [ "$CONFIG_UNZIP" = "y" ]; then - rm -rf $WORKDIR/tmp/usr - mkdir -p $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR/usr + mkdir -p $TMPDIR/usr || exit 1 make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man || exit 1 fi ;; Index: squidguard =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- squidguard 20 Oct 2007 12:46:08 -0000 1.2.2.2 +++ squidguard 21 Feb 2008 20:34:38 -0000 1.2.2.3 @@ -42,15 +42,15 @@ install ) if [ "$CONFIG_SQUIDGUARD" = "y" ]; then - rm -rf $WORKDIR/tmp - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/doc/squidguard || exit 1 + rm -rf $TMPDIR + mkdir -p $TMPDIR/usr/bin || exit 1 + mkdir -p $TMPDIR/usr/share/doc/squidguard || exit 1 # Create the db directory - mkdir -p $WORKDIR/tmp/var/lib/squidguard/demo || exit 1 - cp src/squidGuard $WORKDIR/tmp/usr/bin/ - cp doc/* $WORKDIR/tmp/usr/share/doc/squidguard - cp -r samples $WORKDIR/tmp/usr/share/doc/squidguard - cp -r test $WORKDIR/tmp/usr/share/doc/squidguard + mkdir -p $TMPDIR/var/lib/squidguard/demo || exit 1 + cp src/squidGuard $TMPDIR/usr/bin/ + cp doc/* $TMPDIR/usr/share/doc/squidguard + cp -r samples $TMPDIR/usr/share/doc/squidguard + cp -r test $TMPDIR/usr/share/doc/squidguard echo "logdir /var/log" > $ETCDIR/etc/squidguard.conf echo "dbhome /var/lib/squidguard" >> $ETCDIR/etc/squidguard.conf echo "" >> $ETCDIR/etc/squidguard.conf @@ -59,8 +59,8 @@ echo " pass all" >> $ETCDIR/etc/squidguard.conf echo " }" >> $ETCDIR/etc/squidguard.conf echo "}" >> $ETCDIR/etc/squidguard.conf - 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: unionfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/unionfs,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- unionfs 15 Apr 2006 21:13:51 -0000 1.1.2.2 +++ unionfs 21 Feb 2008 20:34:38 -0000 1.1.2.3 @@ -41,19 +41,19 @@ install ) if [ "$CONFIG_UNIONFS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin - mkdir -p $WORKDIR/tmp/usr/share/man/man{4,8} || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin + mkdir -p $TMPDIR/usr/share/man/man{4,8} || exit 1 - cp union{ctl,dbg,imap} $WORKDIR/tmp/usr/sbin + cp union{ctl,dbg,imap} $TMPDIR/usr/sbin mkdir $CDDIR/lib/modules/`uname -r`/kernel/fs/unionfs cp unionfs.o $CDDIR/lib/modules/`uname -r`/kernel/fs/unionfs/ - cp man/union{ctl,dbg,imap}.8 $WORKDIR/tmp/usr/share/man/man8 - cp man/unionfs.4 $WORKDIR/tmp/usr/share/man/man4 - copy_docs $WORKDIR/tmp || exit 1 - copy_files $WORKDIR/tmp/usr/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp man/union{ctl,dbg,imap}.8 $TMPDIR/usr/share/man/man8 + cp man/unionfs.4 $TMPDIR/usr/share/man/man4 + copy_docs $TMPDIR || exit 1 + copy_files $TMPDIR/usr/sbin $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: reiserfsprogs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- reiserfsprogs 31 Jul 2007 07:22:23 -0000 1.14.2.1 +++ reiserfsprogs 21 Feb 2008 20:34:37 -0000 1.14.2.2 @@ -34,17 +34,17 @@ install ) disable_et_dyn - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/* $CDDIR || exit 1 ln -sf mkreiserfs $CDDIR/sbin/mkfs.reiserfs || exit 1 ln -sf reiserfsck $CDDIR/sbin/fsck.reiserfs || exit 1 ln -sf debugreiserfs $CDDIR/sbin/debugfs.reiserfs || exit 1 ln -sf reiserfstune $CDDIR/sbin/tunefs.reiserfs || exit 1 ln -sf resize_reiserfs $CDDIR/sbin/resizefs.reiserfs || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: ncftp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ncftp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- ncftp 11 Jan 2004 14:43:04 -0000 1.7 +++ ncftp 21 Feb 2008 20:34:37 -0000 1.7.2.1 @@ -39,16 +39,16 @@ install ) if [ "$CONFIG_NCFTP" = "y" ]; then make install || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man/man1 || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/man/man1 || exit 1 make install SYSCONFDIR=/etc \ - BINDIR=$WORKDIR/tmp/usr/bin \ - mandir=$WORKDIR/tmp/usr/share/man \ + BINDIR=$TMPDIR/usr/bin \ + mandir=$TMPDIR/usr/share/man \ || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR mkdir -p $CDDIR/usr/bin - cp -p $WORKDIR/tmp/usr/bin/* $CDDIR/usr/bin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -p $TMPDIR/usr/bin/* $CDDIR/usr/bin/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: passwdgen =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/passwdgen,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -d -r1.12 -r1.12.2.1 --- passwdgen 11 Jan 2004 14:43:04 -0000 1.12 +++ passwdgen 21 Feb 2008 20:34:37 -0000 1.12.2.1 @@ -40,17 +40,17 @@ install ) if [ "$CONFIG_PASSWDGEN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/bin || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: minicom =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/minicom,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- minicom 20 Oct 2007 12:46:08 -0000 1.5.2.1 +++ minicom 21 Feb 2008 20:34:37 -0000 1.5.2.2 @@ -36,11 +36,11 @@ install ) if [ "$CONFIG_MINICOM" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/man || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: mgetty =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mgetty,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- mgetty 20 Mar 2004 15:39:10 -0000 1.8 +++ mgetty 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -41,22 +41,22 @@ useradd -u 33 -g uucp -s /bin/false fax || exit 1 useradd -u 10 -g uucp -s /bin/false uucp || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin || exit 1 - make install CONFDIR=$WORKDIR/tmp/etc/mgetty+sendfax prefix=$WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin || exit 1 + make install CONFDIR=$TMPDIR/etc/mgetty+sendfax prefix=$TMPDIR/usr || exit 1 pushd callback > /dev/null - make install BINDIR=$WORKDIR/tmp/usr/bin \ - SBINDIR=$WORKDIR/tmp/usr/sbin \ + make install BINDIR=$TMPDIR/usr/bin \ + SBINDIR=$TMPDIR/usr/sbin \ INSTALL="install -c -o bin -g bin" || exit 1 popd > /dev/null - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc || exit + cp -dpR $TMPDIR/etc/* $ETCDIR/etc || exit - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: psmisc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/psmisc,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- psmisc 11 Jan 2004 14:43:05 -0000 1.9 +++ psmisc 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -31,12 +31,12 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/ || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - cp -dpR $WORKDIR/tmp/bin/* $CDDIR/bin || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/ || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + cp -dpR $TMPDIR/bin/* $CDDIR/bin || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR || exit 1 ;; * ) Index: apcupsd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- apcupsd 4 May 2004 01:04:57 -0000 1.6 +++ apcupsd 21 Feb 2008 20:34:37 -0000 1.6.2.1 @@ -54,20 +54,20 @@ install ) if [ "$CONFIG_APCUPSD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/apcupsd/{css,cgi} || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + mkdir -p $TMPDIR/usr/share/apcupsd/{css,cgi} || exit 1 + make install DESTDIR=$TMPDIR || exit 1 mkdir -p $ETCDIR/etc/apcupsd || exit 1 - cp -dp $WORKDIR/tmp/etc/apcupsd/* $ETCDIR/etc/apcupsd/ || exit 1 + cp -dp $TMPDIR/etc/apcupsd/* $ETCDIR/etc/apcupsd/ || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/apcupsd $ETCDIR/etc/init.d/ || exit 1 cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1 Index: dnsmasq =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dnsmasq,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- dnsmasq 22 Apr 2004 15:11:01 -0000 1.1 +++ dnsmasq 21 Feb 2008 20:34:37 -0000 1.1.2.1 @@ -35,15 +35,15 @@ install ) if [ "$CONFIG_DNSMASQ" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 - make install PREFIX=/usr DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/{man,info} || exit 1 + make install PREFIX=/usr DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/{man,info} || exit 1 mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp dnsmasq.conf.example $ETCDIR/etc/ || exit 1 cp $MYDIR/scripts/dnsmasq $ETCDIR/etc/init.d/ || exit 1 Index: net-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- net-tools 13 Oct 2004 02:34:47 -0000 1.14.2.1 +++ net-tools 21 Feb 2008 20:34:37 -0000 1.14.2.2 @@ -36,13 +36,13 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install BASEDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - #cp -dpR $WORKDIR/tmp/* $RAMDISKDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install BASEDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + #cp -dpR $TMPDIR/* $RAMDISKDIR/ || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- Mail-SpamAssassin 21 Oct 2006 14:33:17 -0000 1.8.2.1 +++ Mail-SpamAssassin 21 Feb 2008 20:34:37 -0000 1.8.2.2 @@ -27,8 +27,8 @@ case $1 in build ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$WORKDIR/tmp ENABLE_SSL=yes < /dev/null || exit 1 - # now override the PREFIX setting to not use $WORKDIR/tmp%. MakeMaker + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1 + #... [truncated message content] |
