Menu
▾
▴
devil-linux-commit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(202) |
Nov
(201) |
Dec
(280) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(493) |
Feb
(106) |
Mar
(215) |
Apr
(163) |
May
(79) |
Jun
(193) |
Jul
(47) |
Aug
(71) |
Sep
(127) |
Oct
(41) |
Nov
(49) |
Dec
(120) |
| 2005 |
Jan
(147) |
Feb
(45) |
Mar
(26) |
Apr
(71) |
May
(52) |
Jun
(28) |
Jul
(92) |
Aug
(50) |
Sep
(35) |
Oct
(193) |
Nov
(106) |
Dec
(52) |
| 2006 |
Jan
(51) |
Feb
(38) |
Mar
(33) |
Apr
(79) |
May
(107) |
Jun
(67) |
Jul
(21) |
Aug
(65) |
Sep
(44) |
Oct
(87) |
Nov
(12) |
Dec
(56) |
| 2007 |
Jan
(48) |
Feb
(58) |
Mar
(63) |
Apr
(31) |
May
(25) |
Jun
(20) |
Jul
(72) |
Aug
(54) |
Sep
(30) |
Oct
(76) |
Nov
(74) |
Dec
(25) |
| 2008 |
Jan
(39) |
Feb
(39) |
Mar
(62) |
Apr
(64) |
May
(59) |
Jun
(31) |
Jul
(25) |
Aug
(25) |
Sep
(17) |
Oct
(24) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(60) |
Feb
(39) |
Mar
(16) |
Apr
(30) |
May
(52) |
Jun
(35) |
Jul
(15) |
Aug
(15) |
Sep
(21) |
Oct
(32) |
Nov
(39) |
Dec
(52) |
| 2010 |
Jan
(42) |
Feb
(40) |
Mar
(23) |
Apr
(20) |
May
(27) |
Jun
(10) |
Jul
(30) |
Aug
(30) |
Sep
(66) |
Oct
(12) |
Nov
(35) |
Dec
(60) |
| 2011 |
Jan
(16) |
Feb
(1) |
Mar
(3) |
Apr
(28) |
May
(21) |
Jun
|
Jul
(12) |
Aug
(6) |
Sep
(10) |
Oct
(14) |
Nov
(40) |
Dec
(60) |
| 2012 |
Jan
(23) |
Feb
(17) |
Mar
(24) |
Apr
(18) |
May
(13) |
Jun
(1) |
Jul
|
Aug
(5) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(15) |
| 2013 |
Jan
(2) |
Feb
(5) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2014 |
Jan
(3) |
Feb
(5) |
Mar
(8) |
Apr
(3) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(4) |
Oct
(10) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(18) |
Feb
(17) |
Mar
(5) |
Apr
(2) |
May
|
Jun
(5) |
Jul
(1) |
Aug
(2) |
Sep
(1) |
Oct
(24) |
Nov
(20) |
Dec
(41) |
| 2016 |
Jan
(9) |
Feb
(3) |
Mar
(2) |
Apr
(7) |
May
(8) |
Jun
(1) |
Jul
(6) |
Aug
(5) |
Sep
(2) |
Oct
(6) |
Nov
(1) |
Dec
(6) |
| 2017 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bruce S. <bl...@us...> - 2008-03-03 13:40:42
|
Update of /cvsroot/devil-linux/build/scripts/configuration/profiles In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2768/scripts/configuration/profiles Modified Files: default Log Message: Remove unused config line. Index: default =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- default 3 Mar 2008 01:24:32 -0000 1.79 +++ default 3 Mar 2008 13:40:38 -0000 1.80 @@ -86,7 +86,6 @@ CONFIG_LIBSAFE=y CONFIG_LIBSTDC_COMPAT=y CONFIG_LINUX_NR_CPUS=4 -CONFIG_LINUX_POWER_MGMT=ACPI CONFIG_LINUX_SYSRQ=n CONFIG_LINUX_VERSION=2.6 CONFIG_LINUX_WLAN_NG=y |
|
From: Bruce S. <bl...@us...> - 2008-03-03 01:25:18
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21227 Modified Files: CHANGES Log Message: Stupid copy/paste. :-) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1175 retrieving revision 1.1176 diff -u -d -r1.1175 -r1.1176 --- CHANGES 3 Mar 2008 01:02:26 -0000 1.1175 +++ CHANGES 3 Mar 2008 01:25:08 -0000 1.1176 @@ -22,7 +22,7 @@ # 1.3.4 -- updated LVM2 to LVM2.2.02.33.tgz (bs) +- updated LVM2 to 2.02.33 (bs) - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) - updated grsecurity to 2.1.11-2.6.24.2-200802192340 |
|
From: Bruce S. <bl...@us...> - 2008-03-03 01:24:43
|
Update of /cvsroot/devil-linux/build/scripts/configuration/profiles In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21208/scripts/configuration/profiles Modified Files: default Log Message: Fix VMware modules default Index: default =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- default 1 Feb 2008 10:19:14 -0000 1.78 +++ default 3 Mar 2008 01:24:32 -0000 1.79 @@ -206,7 +206,7 @@ CONFIG_VBLADE=y CONFIG_VIM=y CONFIG_VLAN=y -CONFIG_VMWARE=y +CONFIG_OPEN_VM_TOOLS=y CONFIG_VOBCOPY=y CONFIG_VSFTPD=y CONFIG_VTUN=y |
|
From: Bruce S. <bl...@us...> - 2008-03-03 01:02:30
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13257 Modified Files: CHANGES md5sum.lst Log Message: Updated LVM2 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1174 retrieving revision 1.1175 diff -u -d -r1.1174 -r1.1175 --- CHANGES 28 Feb 2008 16:36:52 -0000 1.1174 +++ CHANGES 3 Mar 2008 01:02:26 -0000 1.1175 @@ -22,6 +22,7 @@ # 1.3.4 +- updated LVM2 to LVM2.2.02.33.tgz (bs) - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) - updated grsecurity to 2.1.11-2.6.24.2-200802192340 Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.412 retrieving revision 1.413 diff -u -d -r1.412 -r1.413 --- md5sum.lst 22 Feb 2008 15:27:39 -0000 1.412 +++ md5sum.lst 3 Mar 2008 01:02:26 -0000 1.413 @@ -86,7 +86,7 @@ dff10a5a6451b80ff11f31008417e7e1 src/IMQ-iptables-1.3.6.diff.bz2 55c64bb056b8172ef6eeaf182dccae70 src/ImageMagick-6.3.1-2.tar.bz2 f75e97be15f2238508d8c43f833739e1 src/LPRng-3.8.29-RC2.tar.gz -a8467589944af2701ed696838f52dbd4 src/LVM2.2.02.31.tgz +c33883f3db8185a987ad3c774c685861 src/LVM2.2.02.33.tgz f526c794482ce21c31866549e05c45de src/Linux-PAM-0.99.9.0.tar.bz2 90901044f52f5213a2abc612b9745c1b src/MOSIX-1.9.0.tgz 6b154c442a335c2a281defe17c8008e8 src/MOSKRN-1.9.0.tgz |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:38:16
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5919/scripts Modified Files: Tag: rel-1-2-patches razor-agents Log Message: make sure tmpdir exists Index: razor-agents =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- razor-agents 21 Feb 2008 20:34:37 -0000 1.2.2.2 +++ razor-agents 28 Feb 2008 16:38:12 -0000 1.2.2.3 @@ -25,7 +25,7 @@ case $1 in build ) if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then - perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR < /dev/null || exit 1 + perl Makefile.PL PREFIX=/usr < /dev/null || exit 1 # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... @@ -33,15 +33,16 @@ strip_debug # we need to install it, otherwise it will fail later - make install DESTDIR= || exit 1 + make install || exit 1 fi ;; install ) if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR - make install || exit 1 + make DESTDIR=$TMPDIR install || exit 1 copy_docs $TMPDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:38:04
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5570 Modified Files: razor-agents Log Message: make sure tmpdir exists Index: razor-agents =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- razor-agents 13 Dec 2004 22:12:29 -0000 1.5 +++ razor-agents 28 Feb 2008 16:37:59 -0000 1.6 @@ -40,6 +40,7 @@ install ) if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR make DESTDIR=$TMPDIR install || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:37:02
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5202 Modified Files: CHANGES Log Message: - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1173 retrieving revision 1.1174 diff -u -d -r1.1173 -r1.1174 --- CHANGES 22 Feb 2008 15:27:39 -0000 1.1173 +++ CHANGES 28 Feb 2008 16:36:52 -0000 1.1174 @@ -22,6 +22,8 @@ # 1.3.4 +- corrected motion compile (Heiko / Martin Wilderoth) +- corrected dhcp compile (Heiko / Martin Wilderoth) - updated grsecurity to 2.1.11-2.6.24.2-200802192340 - updated open-vm-tools to 2008.02.13-7792 - updated pax-linux to 2.6.24.2-test30 |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:36:58
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5202/scripts Modified Files: dhcp motion Log Message: - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) Index: motion =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/motion,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- motion 13 Dec 2004 17:31:11 -0000 1.5 +++ motion 28 Feb 2008 16:36:52 -0000 1.6 @@ -38,19 +38,17 @@ else OPT_FLAGS="$OPT_FLAGS --with-pgsql=/usr/include" fi - /bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \ - --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1 + /bin/sh configure --prefix=/usr --bindir=/usr/sbin \ + --sysconfdir=/etc --mandir=/usr/share/man $OPT_FLAGS || exit 1 make $PMAKE all || exit 1 - echo $TMPDIR > DL.TMPDIR strip_debug fi ;; install ) if [ "$CONFIG_MOTION" = "y" ]; then - TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR || exit 1 copy_man $TMPDIR || exit 1 Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- dhcp 24 Dec 2004 17:03:50 -0000 1.24 +++ dhcp 28 Feb 2008 16:36:52 -0000 1.25 @@ -34,15 +34,15 @@ fi # correct pathnames cat > site.conf <<-EOF - USERBINDIR = $TMPDIR/usr/bin - BINDIR = $TMPDIR/usr/sbin - CLIENTBINDIR=$TMPDIR/sbin - ADMMANDIR = $TMPDIR/usr/share/man/man8 - FFMANDIR = $TMPDIR/usr/share/man/man5 - LIBMANDIR = $TMPDIR/usr/share/man/man3 - USRMANDIR = $TMPDIR/usr/share/man/man1 - LIBDIR=$TMPDIR/usr/local/lib - INCDIR=$TMPDIR/usr/local/include + USERBINDIR = /usr/bin + BINDIR = /usr/sbin + CLIENTBINDIR = /sbin + ADMMANDIR = /usr/share/man/man8 + FFMANDIR = /usr/share/man/man5 + LIBMANDIR = /usr/share/man/man3 + USRMANDIR = /usr/share/man/man1 + LIBDIR=/usr/local/lib + INCDIR=/usr/local/include EOF echo $TMPDIR > DL.TMPDIR @@ -58,7 +58,7 @@ TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/sbin || exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/local || exit 1 rm -rf $TMPDIR/usr/share || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:36:35
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5177/scripts Modified Files: Tag: rel-1-2-patches dhcp motion Log Message: - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) Index: motion =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/motion,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- motion 21 Feb 2008 20:34:37 -0000 1.1.2.2 +++ motion 28 Feb 2008 16:36:30 -0000 1.1.2.3 @@ -38,8 +38,8 @@ else OPT_FLAGS="$OPT_FLAGS --with-pgsql=/usr/include" fi - /bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \ - --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1 + /bin/sh configure --prefix=/usr --bindir=/usr/sbin \ + --sysconfdir=/etc --mandir=/usr/share/man $OPT_FLAGS || exit 1 make $PMAKE all || exit 1 strip_debug fi @@ -48,7 +48,7 @@ install ) if [ "$CONFIG_MOTION" = "y" ]; then rm -rf $TMPDIR || exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR || exit 1 copy_man $TMPDIR || exit 1 Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -d -r1.21.2.1 -r1.21.2.2 --- dhcp 21 Feb 2008 20:34:37 -0000 1.21.2.1 +++ dhcp 28 Feb 2008 16:36:30 -0000 1.21.2.2 @@ -28,18 +28,24 @@ case $1 in build ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then + if [ ! -f .dl_patch_done ]; then + bzcat $DL_DIR/src/dhcp-3.0.1-fix_gcc_3.4.3_compile_error-1.patch.bz2 | patch -p1 || exit 1 + touch .dl_patch_done + fi # correct pathnames cat > site.conf <<-EOF - USERBINDIR = $TMPDIR/usr/bin - BINDIR = $TMPDIR/usr/sbin - CLIENTBINDIR=$TMPDIR/sbin - ADMMANDIR = $TMPDIR/usr/share/man/man8 - FFMANDIR = $TMPDIR/usr/share/man/man5 - LIBMANDIR = $TMPDIR/usr/share/man/man3 - USRMANDIR = $TMPDIR/usr/share/man/man1 - LIBDIR=$TMPDIR/usr/local/lib - INCDIR=$TMPDIR/usr/local/include + USERBINDIR = /usr/bin + BINDIR = /usr/sbin + CLIENTBINDIR = /sbin + ADMMANDIR = /usr/share/man/man8 + FFMANDIR = /usr/share/man/man5 + LIBMANDIR = /usr/share/man/man3 + USRMANDIR = /usr/share/man/man1 + LIBDIR=/usr/local/lib + INCDIR=/usr/local/include EOF + + echo $TMPDIR > DL.TMPDIR ./configure || exit 1 make $PMAKE all || exit 1 @@ -49,9 +55,10 @@ install ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then + TMPDIR=$(cat DL.TMPDIR) rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/sbin || exit 1 - make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/local || exit 1 rm -rf $TMPDIR/usr/share || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2008-02-28 16:36:34
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5177 Modified Files: Tag: rel-1-2-patches CHANGES Log Message: - corrected motion compile (Heiko / Martin Wilderoth) - corrected dhcp compile (Heiko / Martin Wilderoth) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.807.2.350 retrieving revision 1.807.2.351 diff -u -d -r1.807.2.350 -r1.807.2.351 --- CHANGES 22 Feb 2008 15:22:18 -0000 1.807.2.350 +++ CHANGES 28 Feb 2008 16:36:30 -0000 1.807.2.351 @@ -22,6 +22,8 @@ # 1.2.15 +- corrected motion compile (Heiko / Martin Wilderoth) +- corrected dhcp compile (Heiko / Martin Wilderoth) - updated open-vm-tools to 2008.02.13-7792 - added hotfix to allow ntop links agains net-snmp (sl) - updated awstats to 6.7 |
|
From: Heiko Z. <smi...@us...> - 2008-02-27 16:06:55
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31701 Modified Files: udev Log Message: make sure frandom and erandom are world readable Index: udev =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/udev,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- udev 3 Apr 2007 12:01:32 -0000 1.11 +++ udev 27 Feb 2008 16:06:49 -0000 1.12 @@ -60,6 +60,10 @@ mkdir -p $DOCDIR/udev || exit 1 cp -dpvR etc $DOCDIR/udev/ || exit 1 cp -dpvR docs $DOCDIR/udev/ || exit 1 + + echo 'KERNEL=="erandom", MODE="0444' > $ETCDIR/etc/udev/rules.d/25-frandom.rules || exit 1 + echo 'KERNEL=="frandom", MODE="0444' >> $ETCDIR/etc/udev/rules.d/25-frandom.rules || exit 1 + rm -rf $TMPDIR || exit 1 ;; |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 15:29:40
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv8130 Modified Files: Tag: rel-1-2-patches md5sum.lst Log Message: oops Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.102.2.236 retrieving revision 1.102.2.237 diff -u -d -r1.102.2.236 -r1.102.2.237 --- md5sum.lst 22 Feb 2008 15:22:18 -0000 1.102.2.236 +++ md5sum.lst 22 Feb 2008 15:29:36 -0000 1.102.2.237 @@ -374,7 +374,6 @@ fcb32a01e1ae3f9ed5bac86b12c7a1cc src/ntp-4.2.4p4.tar.gz b08fde86191154bbcfda860f95a5dca2 src/nut-2.0.5.tar.gz cf1c017496b066b45ffe3d7a303fd6ad src/oidentd-2.0.7.tar.gz -dd82eb1859d907870ee77c927ca36f1b src/open-vm-tools-2008.01.23-74039.tar.gz e796dc2c452e848a8f91bc1443fab3a5 src/open-vm-tools-2008.02.13-77928.tar.gz d7043ba34b5038f0113b099ede0884fb src/openh323-v1_18_0-src.tar.gz f83b0f2b62f6a06dc1ca83a1f0426efd src/openldap-2.3.38.tgz |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 15:27:48
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7413 Modified Files: CHANGES md5sum.lst Log Message: - updated grsecurity to 2.1.11-2.6.24.2-200802192340 - updated open-vm-tools to 2008.02.13-7792 - updated pax-linux to 2.6.24.2-test30 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1172 retrieving revision 1.1173 diff -u -d -r1.1172 -r1.1173 --- CHANGES 22 Feb 2008 10:00:12 -0000 1.1172 +++ CHANGES 22 Feb 2008 15:27:39 -0000 1.1173 @@ -22,6 +22,9 @@ # 1.3.4 +- updated grsecurity to 2.1.11-2.6.24.2-200802192340 +- updated open-vm-tools to 2008.02.13-7792 +- updated pax-linux to 2.6.24.2-test30 - added hotfix to allow ntop links agains net-snmp (sl) - updated awstats to 6.7 - updated clamav to 0.92.1 Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.411 retrieving revision 1.412 diff -u -d -r1.411 -r1.412 --- md5sum.lst 22 Feb 2008 09:38:12 -0000 1.411 +++ md5sum.lst 22 Feb 2008 15:27:39 -0000 1.412 @@ -234,7 +234,7 @@ df1966f0e871014fa75c98b048e78b92 src/gradm-2.1.11-200708011700.tar.gz 52202fe462770fa6be1bb667bd6cf30c src/grep-2.5.1a.tar.bz2 f7c9cf2e4b9967d3af167d7c9fadaae4 src/groff-1.19.2.tar.gz -1152a97238825fba3d66503897c0e6bb src/grsecurity-2.1.11-2.6.24.2-200802142000.patch.bz2 +879503510abf9865a0c739cf8011d93d src/grsecurity-2.1.11-2.6.24.2-200802192340.patch.bz2 cd3f3eb54446be6003156158d51f4884 src/grub-0.97.tar.gz b5bac2d21840ae077e0217bc5e4845b1 src/gzip-1.3.12.tar.gz 62749c6cdf28ce31aae335092fa107df src/hdparm-6.9.tar.gz @@ -390,7 +390,7 @@ 5cc5a621832a70e012462d2069149583 src/ntpconfig-phone.patch.bz2 b08fde86191154bbcfda860f95a5dca2 src/nut-2.0.5.tar.gz cf1c017496b066b45ffe3d7a303fd6ad src/oidentd-2.0.7.tar.gz -dd82eb1859d907870ee77c927ca36f1b src/open-vm-tools-2008.01.23-74039.tar.gz +e796dc2c452e848a8f91bc1443fab3a5 src/open-vm-tools-2008.02.13-77928.tar.gz d7043ba34b5038f0113b099ede0884fb src/openh323-v1_18_0-src.tar.gz 4c58dc2d5503e8ace6c14c55a7b847d9 src/openl2tp-0.19.tar.gz e1dd82f54cffad3d76da9e712dc58c48 src/openl2tp-0.19_ppp_unix.c.patch.bz2 @@ -410,7 +410,7 @@ 097cf193d1b040cf0d135945714faa83 src/passwdgen-2.2.tar.gz 5e7fb6b61bd5af063ddd50b548355e94 src/patch-2.6.24.2.bz2 985db2dea95f711c59c9b4fd3c471baa src/patch-o-matic-ng-20080125.tar.bz2 -c3c388344fcd526fc2ec9f2cf11d3c6e src/pax-linux-2.6.23.11-test15.patch.bz2 +af862f69b7b88540680a3eafe114f97b src/pax-linux-2.6.24.2-test30.patch.bz2 acf0e368cb33bc2f6a335ba3f5e4fd2b src/pax-utils-0.1.15.tar.bz2 149bcb2508e9bfb092954c294b97f876 src/pci.ids.bz2 9c937db43a72f4ba768af9e1da331885 src/pciutils-2.2.5.tar.gz |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 15:22:25
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5625 Modified Files: Tag: rel-1-2-patches CHANGES md5sum.lst Log Message: - updated open-vm-tools to 2008.02.13-7792 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.807.2.349 retrieving revision 1.807.2.350 diff -u -d -r1.807.2.349 -r1.807.2.350 --- CHANGES 22 Feb 2008 10:01:57 -0000 1.807.2.349 +++ CHANGES 22 Feb 2008 15:22:18 -0000 1.807.2.350 @@ -22,6 +22,7 @@ # 1.2.15 +- updated open-vm-tools to 2008.02.13-7792 - added hotfix to allow ntop links agains net-snmp (sl) - updated awstats to 6.7 - updated clamav to 0.92.1 Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.102.2.235 retrieving revision 1.102.2.236 diff -u -d -r1.102.2.235 -r1.102.2.236 --- md5sum.lst 22 Feb 2008 09:47:22 -0000 1.102.2.235 +++ md5sum.lst 22 Feb 2008 15:22:18 -0000 1.102.2.236 @@ -375,6 +375,7 @@ b08fde86191154bbcfda860f95a5dca2 src/nut-2.0.5.tar.gz cf1c017496b066b45ffe3d7a303fd6ad src/oidentd-2.0.7.tar.gz dd82eb1859d907870ee77c927ca36f1b src/open-vm-tools-2008.01.23-74039.tar.gz +e796dc2c452e848a8f91bc1443fab3a5 src/open-vm-tools-2008.02.13-77928.tar.gz d7043ba34b5038f0113b099ede0884fb src/openh323-v1_18_0-src.tar.gz f83b0f2b62f6a06dc1ca83a1f0426efd src/openldap-2.3.38.tgz 50a800fd2c6def9e9a53068837e87b91 src/openssh-4.7p1.tar.gz |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 15:22:24
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5625/scripts Modified Files: Tag: rel-1-2-patches open-vm-tools Log Message: - updated open-vm-tools to 2008.02.13-7792 Index: open-vm-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- open-vm-tools 20 Oct 2007 12:46:08 -0000 1.1.2.2 +++ open-vm-tools 22 Feb 2008 15:22:18 -0000 1.1.2.3 @@ -27,38 +27,38 @@ case $1 in build ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - ./configure --prefix=/usr --disable-multimon --without-x || exit 1 - #make LDFLAGS=-liconv all || exit 1 - make all || exit 1 - echo "DONE" - exit 1 - - mkdir -p /lib/modules/$KERNELVERSION || exit 1 - ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1 - make || exit 1 + CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --without-x || exit 1 + make all modules || exit 1 fi ;; install ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 - cp -v vmmemctl-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/misc/vmmemctl.o || exit 1 - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/ || exit 1 - cp -v vmxnet-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/vmxnet.o || exit 1 - - VMBINDIR=$(find_src_dir vmbin) - cp -dpvR $VMBINDIR/{lib,sbin} $CDDIR/usr/ || exit 1 - mkdir -p $ETCDIR/etc/vmware-tools || exit 1 - cp -dpvR $VMBINDIR/etc/* $ETCDIR/etc/ || exit 1 - cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d || exit 1 + cp -dpvR libguestlib/.libs/libguestlib.so* $CDDIR/usr/lib/ || exit 1 - echo "# Load VMWare drivers?" >> $CONFIGFILE - #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE - #echo "# so you can safely leave this on" >> $CONFIGFILE - echo "START_VMWARE=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP - + # copy all the binaries and put a vmware- in front of it + SBINS="guestd/guestd checkvm/checkvm hgfsclient/hgfsclient hgfsmounter/hgfsmounter xferlogs/xferlogs" + for SBIN in ${SBINS} ; + do + cp -dpv $SBIN $CDDIR/usr/sbin/vmware-${SBIN##*/} + done + + # now lets catch all the modules + mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 + cp -dpv $(find modules/ -name \*.ko) $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 + + mkdir -p $ETCDIR/etc/vmware-tools || exit 1 + cp -dpv scripts/linux/* $ETCDIR/etc/vmware-tools/ || exit 1 + chmod 775 $ETCDIR/etc/vmware-tools/* || exit 1 + + cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d/ || exit 1 + + echo "# Load VMWare drivers?" >> $CONFIGFILE + #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE + #echo "# so you can safely leave this on" >> $CONFIGFILE + echo "START_VMWARE=no" >> $CONFIGFILE + echo >> $CONFIGFILE + echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP fi ;; |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 14:27:43
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18175 Modified Files: Tag: rel-1-2-patches Mail-SpamAssassin Log Message: fixes for $TMPDIR Index: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -u -d -r1.8.2.2 -r1.8.2.3 --- Mail-SpamAssassin 21 Feb 2008 20:34:37 -0000 1.8.2.2 +++ Mail-SpamAssassin 22 Feb 2008 14:27:39 -0000 1.8.2.3 @@ -27,7 +27,7 @@ case $1 in build ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1 + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc ENABLE_SSL=yes < /dev/null || exit 1 # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... make $PMAKE PREFIX=/usr || exit 1 @@ -40,8 +40,9 @@ install ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/lib || exit 1 - make install || exit 1 + make DESTDIR=$TMPDIR install || exit 1 install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2008-02-22 14:27:33
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18158 Modified Files: Mail-SpamAssassin Log Message: fixes for $TMPDIR Index: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Mail-SpamAssassin 21 Feb 2008 20:32:47 -0000 1.13 +++ Mail-SpamAssassin 22 Feb 2008 14:27:27 -0000 1.14 @@ -27,7 +27,7 @@ case $1 in build ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1 + perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc ENABLE_SSL=yes < /dev/null || exit 1 # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... make $PMAKE PREFIX=/usr || exit 1 @@ -40,8 +40,9 @@ install ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/lib || exit 1 - make install || exit 1 + make DESTDIR=$TMPDIR install || exit 1 install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 |
|
From: Serge L. <sma...@us...> - 2008-02-22 10:02:02
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18149 Modified Files: Tag: rel-1-2-patches CHANGES Log Message: - added hotfix (ntop & net-snmp) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.807.2.348 retrieving revision 1.807.2.349 diff -u -d -r1.807.2.348 -r1.807.2.349 --- CHANGES 20 Feb 2008 16:29:05 -0000 1.807.2.348 +++ CHANGES 22 Feb 2008 10:01:57 -0000 1.807.2.349 @@ -22,6 +22,7 @@ # 1.2.15 +- added hotfix to allow ntop links agains net-snmp (sl) - updated awstats to 6.7 - updated clamav to 0.92.1 - updated curl to 7.18.0 |
|
From: Serge L. <sma...@us...> - 2008-02-22 10:00:23
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17362 Modified Files: CHANGES Log Message: - added hotfix (ntop & net-snmp) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1171 retrieving revision 1.1172 diff -u -d -r1.1171 -r1.1172 --- CHANGES 19 Feb 2008 16:27:31 -0000 1.1171 +++ CHANGES 22 Feb 2008 10:00:12 -0000 1.1172 @@ -22,6 +22,7 @@ # 1.3.4 +- added hotfix to allow ntop links agains net-snmp (sl) - updated awstats to 6.7 - updated clamav to 0.92.1 - updated curl to 7.18.0 |
|
From: Serge L. <sma...@us...> - 2008-02-22 09:47:26
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12469 Modified Files: Tag: rel-1-2-patches md5sum.lst Log Message: - added hot-fix to allow compile ntop against net-snmp Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.102.2.234 retrieving revision 1.102.2.235 diff -u -d -r1.102.2.234 -r1.102.2.235 --- md5sum.lst 20 Feb 2008 16:29:05 -0000 1.102.2.234 +++ md5sum.lst 22 Feb 2008 09:47:22 -0000 1.102.2.235 @@ -355,6 +355,7 @@ b6593abe1089d6aab1551c105c9300e3 src/ncurses-5.6.tar.gz dc482c5b16fd0d8b7a245320011e7986 src/ndiswrapper-1.13.tar.gz 6c974df7a5a5b1579f72115e6b045bda src/net-snmp-5.4.1.tar.gz +65c1c36ab2d7a541f5c692270c14f727 src/net-snmp.ntop.patch.bz2 888774accab40217dde927e21979c165 src/net-tools-1.60.tar.bz2 a383c30f684739dfeea4e72436061533 src/net-tools-fddi.diff.bz2 71091a5dd65eac16ca841ce06e5de7fa src/net-tools_1.60-9-dl.diff.bz2 |
|
From: Serge L. <sma...@us...> - 2008-02-22 09:47:26
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12469/scripts Modified Files: Tag: rel-1-2-patches net-snmp Log Message: - added hot-fix to allow compile ntop against net-snmp Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -d -r1.4.2.3 -r1.4.2.4 --- net-snmp 21 Feb 2008 20:34:37 -0000 1.4.2.3 +++ net-snmp 22 Feb 2008 09:47:22 -0000 1.4.2.4 @@ -28,6 +28,8 @@ case $1 in build ) if [ "$CONFIG_NET_SNMP" = "y" ]; then + # HOT-FIX + bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1 ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1 # disable parallel builds make all || exit 1 |
|
From: Serge L. <sma...@us...> - 2008-02-22 09:38:21
|
Update of /cvsroot/devil-linux/build In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9100 Modified Files: md5sum.lst Log Message: - added hot-fix to allow compile ntop against net-snmp Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.410 retrieving revision 1.411 diff -u -d -r1.410 -r1.411 --- md5sum.lst 19 Feb 2008 16:27:32 -0000 1.410 +++ md5sum.lst 22 Feb 2008 09:38:12 -0000 1.411 @@ -373,6 +373,7 @@ b6593abe1089d6aab1551c105c9300e3 src/ncurses-5.6.tar.gz 3ab2aeef398d29df3a40d40fa499405e src/ndiswrapper-1.52.tar.gz 6c974df7a5a5b1579f72115e6b045bda src/net-snmp-5.4.1.tar.gz +65c1c36ab2d7a541f5c692270c14f727 src/net-snmp.ntop.patch.bz2 888774accab40217dde927e21979c165 src/net-tools-1.60.tar.bz2 e4da725325c175f1b4c114c5e305cfa8 src/net-tools_1.60-9.diff.gz c2bc56b61028bce36a5cc3fe7e81058e src/netacct-mysql-0.78.tar.gz |
|
From: Serge L. <sma...@us...> - 2008-02-22 09:38:21
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9100/scripts Modified Files: net-snmp Log Message: - added hot-fix to allow compile ntop against net-snmp Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- net-snmp 19 Nov 2007 14:07:16 -0000 1.10 +++ net-snmp 22 Feb 2008 09:38:13 -0000 1.11 @@ -28,6 +28,8 @@ case $1 in build ) if [ "$CONFIG_NET_SNMP" = "y" ]; then + # HOT-FIX + bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1 ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1 # disable parallel builds make -j1 all || exit 1 |
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 + # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... make $PMAKE PREFIX=/usr || exit 1 make $PMAKE spamd/libspamc.so || exit 1 @@ -39,20 +39,20 @@ install ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 make install || exit 1 - install -m 0755 spamd/libspamc.so $WORKDIR/tmp/usr/lib || exit 1 + install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 - rm -rf $WORKDIR/tmp/usr/share/ || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 + rm -rf $TMPDIR/usr/share/ || 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 cp $MYDIR/scripts/spamd $ETCDIR/etc/init.d || exit 1 Index: ser =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ser,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- ser 20 Mar 2004 16:18:00 -0000 1.1 +++ ser 21 Feb 2008 20:34:38 -0000 1.1.2.1 @@ -25,7 +25,7 @@ MYNAME=SER -MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$WORKDIR/tmp BASEDIR=$WORKDIR/tmp" +MAKEOPT="prefix=/usr cfg-target=/etc/ser/ cfg-prefix=$TMPDIR BASEDIR=$TMPDIR" MAKEOPT="$MAKEOPT USER_TLS=1" EXCLUDEMODULES="cpl cpl-c ext extcmd postgres snmp im radius_acc radius_auth jabber auth_radius group_radius uri_radius" if [ "$CONFIG_MYSQL_CLIENT" != "y" ]; then @@ -50,13 +50,13 @@ install ) if [ "$CONFIG_SER" = "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 $MAKEOPT exclude_modules="$EXCLUDEMODULES" install || exit 1 - gzip -9 $WORKDIR/tmp/usr/share/man/man[58]/* || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + gzip -9 $TMPDIR/usr/share/man/man[58]/* || exit 1 + copy_files $TMPDIR/etc $ETCDIR || exit 1 + copy_files $TMPDIR/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/ser $ETCDIR/etc/init.d || exit 1 echo "# Start SIP Express Router (ser)?" >> $CONFIGFILE Index: fetchmail =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/fetchmail,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- fetchmail 11 Jan 2004 14:43:04 -0000 1.9 +++ fetchmail 21 Feb 2008 20:34:37 -0000 1.9.2.1 @@ -36,11 +36,11 @@ install ) if [ "$CONFIG_FETCHMAIL" = "y" ]; then - rm -rf $WORKDIR/tmp - make install DESTDIR=$WORKDIR/tmp - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR + make install DESTDIR=$TMPDIR + copy_docs $TMPDIR + cp -dpR $TMPDIR/* $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: alsaplayer =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsaplayer,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- alsaplayer 11 Jan 2004 14:43:04 -0000 1.4 +++ alsaplayer 21 Feb 2008 20:34:37 -0000 1.4.2.1 @@ -38,12 +38,12 @@ install ) if [ "$CONFIG_ALSA_PLAYER" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install-strip DESTDIR=$WORKDIR/tmp || exit 1 - copy_files $WORKDIR/tmp/usr/bin $CDDIR/usr/ || exit 1 - copy_files $WORKDIR/tmp/usr/lib $CDDIR/usr/ || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + make install-strip DESTDIR=$TMPDIR || exit 1 + copy_files $TMPDIR/usr/bin $CDDIR/usr/ || exit 1 + copy_files $TMPDIR/usr/lib $CDDIR/usr/ || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR || exit 1 echo "HELP_$MYNAME=\"$MYNAME is a generic pcm player\"" >> $SOFTWAREHELP fi ;; Index: nail =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nail,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -d -r1.13 -r1.13.2.1 --- nail 11 Jan 2004 14:43:04 -0000 1.13 +++ nail 21 Feb 2008 20:34:37 -0000 1.13.2.1 @@ -36,18 +36,18 @@ install ) if [ "$CONFIG_NAIL" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - ln -sf nail $WORKDIR/tmp/usr/bin/mail - ln -sf nail $WORKDIR/tmp/usr/bin/mailx + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + ln -sf nail $TMPDIR/usr/bin/mail + ln -sf nail $TMPDIR/usr/bin/mailx mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: sed =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sed,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- sed 11 Jan 2004 14:43:05 -0000 1.2 +++ sed 21 Feb 2008 20:34:38 -0000 1.2.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 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - cp -dpR $WORKDIR/tmp/bin/* $CDDIR/bin/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/bin/* $CDDIR/bin/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: rsync =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rsync,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- rsync 15 Apr 2006 01:23:09 -0000 1.2.2.1 +++ rsync 21 Feb 2008 20:34:38 -0000 1.2.2.2 @@ -39,12 +39,12 @@ install ) if [ "$CONFIG_RSYNC" = "y" ]; then - 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/usr $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: alsa-driver =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -d -r1.12 -r1.12.2.1 --- alsa-driver 1 Feb 2004 15:04:23 -0000 1.12 +++ alsa-driver 21 Feb 2008 20:34:37 -0000 1.12.2.1 @@ -44,7 +44,7 @@ install ) if [ "$CONFIG_ALSA" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 make install || exit 1 cp $MYDIR/scripts/alsa-driver $ETCDIR/etc/init.d || exit 1 Index: quota-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/quota-tools,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -d -r1.3.2.2 -r1.3.2.3 --- quota-tools 22 Dec 2005 08:23:15 -0000 1.3.2.2 +++ quota-tools 21 Feb 2008 20:34:37 -0000 1.3.2.3 @@ -35,16 +35,16 @@ install ) if [ "$CONFIG_QUOTA_TOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install ROOTDIR=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/share || exit 1 - rm -rf $WORKDIR/tmp/include || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp/etc || 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 ROOTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/share || exit 1 + rm -rf $TMPDIR/include || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.31.2.5 retrieving revision 1.31.2.6 diff -u -d -r1.31.2.5 -r1.31.2.6 --- glibc 22 Oct 2007 19:35:01 -0000 1.31.2.5 +++ glibc 21 Feb 2008 20:34:37 -0000 1.31.2.6 @@ -75,28 +75,28 @@ install ) cd ../glibc-build || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 - make install install_root=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 + make install install_root=$TMPDIR || exit 1 if [ ! "$CONFIG_NO_LOCALE" = "y" ]; then - make localedata/install-locales install_root=$WORKDIR/tmp || exit 1 - cp -dpR $WORKDIR/tmp/usr/lib/locale $CDDIR/usr/lib/ || exit 1 + make localedata/install-locales install_root=$TMPDIR || exit 1 + cp -dpR $TMPDIR/usr/lib/locale $CDDIR/usr/lib/ || exit 1 else - rm -rf $WORKDIR/tmp/usr/share/i18n || exit 1 - rm -rf $WORKDIR/tmp/usr/share/locale || exit 1 + rm -rf $TMPDIR/usr/share/i18n || exit 1 + rm -rf $TMPDIR/usr/share/locale || exit 1 fi - rm -rf $WORKDIR/tmp/usr/bin/localedef - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/info || exit 1 - rm -rf $WORKDIR/tmp/usr/lib || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - rm -rf $WORKDIR/tmp/sbin/sln || exit 1 - cp -dpR $WORKDIR/tmp/usr/share/* $CDDIR/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - cp -dpR $WORKDIR/tmp/{sbin,usr} $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp/{sbin,usr} || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/bin/localedef + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/info || exit 1 + rm -rf $TMPDIR/usr/lib || exit 1 + rm -rf $TMPDIR/etc || exit 1 + rm -rf $TMPDIR/sbin/sln || exit 1 + cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + cp -dpR $TMPDIR/{sbin,usr} $CDDIR/ || exit 1 + rm -rf $TMPDIR/{sbin,usr} || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: wol =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wol,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- wol 22 Apr 2004 13:59:03 -0000 1.2 +++ wol 21 Feb 2008 20:34:38 -0000 1.2.2.1 @@ -36,16 +36,16 @@ install ) if [ "$CONFIG_WOL" = "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 DESTDIR=$WORKDIR/tmp || exit 1 - rm -f $WORKDIR/tmp/usr/info/dir - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/{man,info} || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + rm -f $TMPDIR/usr/info/dir + 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 fi ;; Index: dhcp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- dhcp 17 Jan 2004 17:35:20 -0000 1.21 +++ dhcp 21 Feb 2008 20:34:37 -0000 1.21.2.1 @@ -30,15 +30,15 @@ if [ "$CONFIG_ISC_DHCP" = "y" ]; then # correct pathnames cat > site.conf <<-EOF - USERBINDIR = $WORKDIR/tmp/usr/bin - BINDIR = $WORKDIR/tmp/usr/sbin - CLIENTBINDIR=$WORKDIR/tmp/sbin - ADMMANDIR = $WORKDIR/tmp/usr/share/man/man8 - FFMANDIR = $WORKDIR/tmp/usr/share/man/man5 - LIBMANDIR = $WORKDIR/tmp/usr/share/man/man3 - USRMANDIR = $WORKDIR/tmp/usr/share/man/man1 - LIBDIR=$WORKDIR/tmp/usr/local/lib - INCDIR=$WORKDIR/tmp/usr/local/include + USERBINDIR = $TMPDIR/usr/bin + BINDIR = $TMPDIR/usr/sbin + CLIENTBINDIR=$TMPDIR/sbin + ADMMANDIR = $TMPDIR/usr/share/man/man8 + FFMANDIR = $TMPDIR/usr/share/man/man5 + LIBMANDIR = $TMPDIR/usr/share/man/man3 + USRMANDIR = $TMPDIR/usr/share/man/man1 + LIBDIR=$TMPDIR/usr/local/lib + INCDIR=$TMPDIR/usr/local/include EOF ./configure || exit 1 @@ -49,19 +49,19 @@ install ) if [ "$CONFIG_ISC_DHCP" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/sbin || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/sbin || exit 1 make install || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/local || exit 1 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/local || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 cp client/dhclient.conf $ETCDIR/etc || exit 1 cp $MYDIR/scripts/dhcpd.conf $ETCDIR/etc/ || exit 1 cp $MYDIR/scripts/dhcrelay.conf $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "# Start DHCP Relay Agent?" >> $CONFIGFILE echo "# configuration file: /etc/dhcrelay.conf" >> $CONFIGFILE Index: ntp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ntp,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -d -r1.18.2.2 -r1.18.2.3 --- ntp 2 Jul 2007 15:16:35 -0000 1.18.2.2 +++ ntp 21 Feb 2008 20:34:37 -0000 1.18.2.3 @@ -36,13 +36,13 @@ install ) if [ "$CONFIG_NTP" = "y" ]; then - rm -rf $WORKDIR/tmp - mkdir -p $WORKDIR/tmp - make install DESTDIR=$WORKDIR/tmp + rm -rf $TMPDIR + mkdir -p $TMPDIR + make install DESTDIR=$TMPDIR mkdir -p $CDDIR/var/lib/hwclock || exit 1 touch $CDDIR/var/lib/hwclock/adjtime || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 mkdir -p $DOCDIR/ntp || exit 1 cp -dpR html/* $DOCDIR/ntp || exit 1 Index: screen =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/screen,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- screen 28 Apr 2004 01:33:43 -0000 1.4 +++ screen 21 Feb 2008 20:34:38 -0000 1.4.2.1 @@ -36,19 +36,19 @@ install ) if [ "$CONFIG_SCREEN" = "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/terminfo/s - cp terminfo/screencap -p $WORKDIR/tmp/usr/share/terminfo/s - mkdir -p $WORKDIR/tmp/etc - cp etc/etcscreenrc $WORKDIR/tmp/etc/screenrc - mkdir -p $WORKDIR/tmp/var/run/screen - copy_docs $WORKDIR/tmp - cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $WORKDIR/tmp/etc || 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 DESTDIR=$TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/share/terminfo/s + cp terminfo/screencap -p $TMPDIR/usr/share/terminfo/s + mkdir -p $TMPDIR/etc + cp etc/etcscreenrc $TMPDIR/etc/screenrc + mkdir -p $TMPDIR/var/run/screen + copy_docs $TMPDIR + cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: raidtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/raidtools,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- raidtools 11 Jan 2004 14:43:05 -0000 1.14 +++ raidtools 21 Feb 2008 20:34:37 -0000 1.14.2.1 @@ -37,15 +37,15 @@ install ) if [ "$CONFIG_RAIDTOOLS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install ROOTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install ROOTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR mkdir -p $DOCDIR/raidtools || exit 1 cp -dp Software-RAID.HOWTO/*.txt $DOCDIR/raidtools || exit 1 - cp -dpR $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/dev/* $CDDIR/dev || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/sbin $CDDIR/ || exit 1 + cp -dpR $TMPDIR/dev/* $CDDIR/dev || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: wget =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wget,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- wget 11 Jan 2004 14:43:05 -0000 1.14 +++ wget 21 Feb 2008 20:34:38 -0000 1.14.2.1 @@ -37,18 +37,18 @@ install ) if [ "$CONFIG_WGET" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/etc || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + mkdir -p $TMPDIR/etc || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/share || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/share || exit 1 mkdir -p $CDDIR - copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: pcmcia-cs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/pcmcia-cs,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -u -d -r1.13.2.1 -r1.13.2.2 --- pcmcia-cs 19 May 2007 14:35:26 -0000 1.13.2.1 +++ pcmcia-cs 21 Feb 2008 20:34:37 -0000 1.13.2.2 @@ -38,21 +38,21 @@ install ) if [ "$CONFIG_PCMCIA_CS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install PREFIX=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr || exit 1 - cp -dpR $WORKDIR/tmp/etc/pcmcia $ETCDIR/etc || exit 1 - cp -dpR $WORKDIR/tmp/etc/sysconfig $ETCDIR/etc || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install PREFIX=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr || exit 1 + cp -dpR $TMPDIR/etc/pcmcia $ETCDIR/etc || exit 1 + cp -dpR $TMPDIR/etc/sysconfig $ETCDIR/etc || exit 1 replace_str $ETCDIR/etc/sysconfig/pcmcia "PCMCIA=yes" "PCMCIA=no" rm $ETCDIR/etc/sysconfig/pcmcia.old cp $MYDIR/scripts/pcmcia $ETCDIR/etc/init.d/ || exit 1 cat etc/rc.pcmcia >> $ETCDIR/etc/init.d/pcmcia || exit 1 - rm -rf $WORKDIR/tmp/etc || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: shfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shfs,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- shfs 21 Mar 2004 17:20:30 -0000 1.1 +++ shfs 21 Feb 2008 20:34:38 -0000 1.1.2.1 @@ -40,7 +40,7 @@ if [ "$CONFIG_SHFS" = "y" ]; then make ROOT=${CDDIR} KERNEL_SOURCES=${KERNELDIR} MAN_PAGE_DIR=/usr/share/man utils-install module-install - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 echo "HELP_$MYNAME=\"$MYNAME to mount remote filesystems using (secure) shell connection\"" >> $SOFTWAREHELP fi Index: openssl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openssl,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- openssl 11 Jan 2004 14:43:04 -0000 1.21 +++ openssl 21 Feb 2008 20:34:37 -0000 1.21.2.1 @@ -40,17 +40,17 @@ install ) if [ "$CONFIG_OPENSSL_BIN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install INSTALL_PREFIX=$WORKDIR/tmp || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 - copy_docs $WORKDIR/tmp/etc/ssl - rm -rf $WORKDIR/tmp/etc/ssl/lib || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install INSTALL_PREFIX=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + copy_docs $TMPDIR/etc/ssl + rm -rf $TMPDIR/etc/ssl/lib || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1 - cp -dpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dpR $TMPDIR/usr $CDDIR/ || exit 1 + cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: sysstat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysstat,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -d -r1.10.2.1 -r1.10.2.2 --- sysstat 11 May 2007 14:46:58 -0000 1.10.2.1 +++ sysstat 21 Feb 2008 20:34:38 -0000 1.10.2.2 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_SYSSTAT" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || 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: jftpgw =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jftpgw,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- jftpgw 27 Mar 2004 17:30:19 -0000 1.16 +++ jftpgw 21 Feb 2008 20:34:37 -0000 1.16.2.1 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_JFTPGW" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm -rf $WORKDIR/tmp/usr/etc - copy_files $WORKDIR/tmp/usr $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm -rf $TMPDIR/usr/etc + copy_files $TMPDIR/usr $CDDIR || exit 1 cp ./jftpgw.conf.sample $ETCDIR/etc || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/jftpgw $ETCDIR/etc/init.d || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE Index: jfsutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jfsutils,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- jfsutils 11 Jan 2004 14:43:04 -0000 1.8 +++ jfsutils 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -34,18 +34,18 @@ install ) if [ "$CONFIG_JFS" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp - rm $WORKDIR/tmp/sbin/fsck.jfs - ln -sf jfs_fsck $WORKDIR/tmp/sbin/fsck.jfs - rm $WORKDIR/tmp/sbin/mkfs.jfs - ln -sf jfs_mkfs $WORKDIR/tmp/sbin/mkfs.jfs - rm -rf $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR + rm $TMPDIR/sbin/fsck.jfs + ln -sf jfs_fsck $TMPDIR/sbin/fsck.jfs + rm $TMPDIR/sbin/mkfs.jfs + ln -sf jfs_mkfs $TMPDIR/sbin/mkfs.jfs + rm -rf $TMPDIR/usr || exit 1 - cp -dfpR $WORKDIR/tmp/* $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + cp -dfpR $TMPDIR/* $CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: mt-st =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mt-st,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- mt-st 24 Apr 2004 01:17:59 -0000 1.1 +++ mt-st 21 Feb 2008 20:34:37 -0000 1.1.2.1 @@ -33,14 +33,14 @@ install ) if [ "$CONFIG_MT_ST" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_docs $WORKDIR/tmp + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_docs $TMPDIR mkdir -p $CDDIR/usr/bin cp -p mt $CDDIR/usr/sbin cp -p stinit $CDDIR/usr/sbin - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: netacct-mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/netacct-mysql,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- netacct-mysql 30 Jul 2007 21:16:54 -0000 1.8.2.1 +++ netacct-mysql 21 Feb 2008 20:34:37 -0000 1.8.2.2 @@ -38,13 +38,13 @@ install ) if [ "$CONFIG_NETACCT" = "y" ]; then if [ "$CONFIG_MYSQL_CLIENT" ="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 - make install DESTDIR=$WORKDIR/tmp - copy_docs $WORKDIR/tmp + make install DESTDIR=$TMPDIR + copy_docs $TMPDIR mkdir -p $ETCDIR/etc || exit 1 - cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1 + cp -dpR $TMPDIR/usr $CDDIR || exit 1 cp -p $MYDIR/scripts/nacctd $ETCDIR/etc/init.d || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE @@ -52,7 +52,7 @@ echo >> $CONFIGFILE echo "HELP_$MYNAME=\"$MYNAME is a daemon that logs network traffic\"" >> $SOFTWAREHELP - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 fi fi ;; Index: modutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Attic/modutils,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -u -d -r1.16.2.2 -r1.16.2.3 --- modutils 24 Sep 2004 13:11:10 -0000 1.16.2.2 +++ modutils 21 Feb 2008 20:34:37 -0000 1.16.2.3 @@ -36,13 +36,13 @@ ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/sbin || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man/man{1,2,5,8} || exit 1 - make install prefix=$WORKDIR/tmp/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1 - copy_docs $WORKDIR/tmp - copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/sbin || exit 1 + mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1 + make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR mandir=$TMPDIR/usr/share/man || exit 1 + copy_docs $TMPDIR + copy_files $TMPDIR/sbin $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 rm $ETCDIR/etc/modprobe.conf 2> /dev/null ;; Index: MOSIX =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/MOSIX,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- MOSIX 11 Jan 2004 14:43:04 -0000 1.8 +++ MOSIX 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -36,22 +36,22 @@ install ) if [ "$CONFIG_MOSIX" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - make install ROOT=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/bin || exit 1 + make install ROOT=$TMPDIR || exit 1 mkdir -p $CDDIR/usr/share/mosix || exit 1 cp LICENSE $CDDIR/usr/share/mosix/ || exit 1 cp README $CDDIR/usr/share/mosix/ || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR copy_man ./man3 copy_man ./man7 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/lib/*a || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 #echo "#cluster /mfs mfs auto,dfsa=1 0 0" >> $ETCDIR/etc/fstab || exit 1 Index: alsa-utils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsa-utils,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- alsa-utils 11 Jan 2004 14:43:04 -0000 1.8 +++ alsa-utils 21 Feb 2008 20:34:37 -0000 1.8.2.1 @@ -39,13 +39,13 @@ install ) if [ "$CONFIG_ALSA" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 - copy_files $WORKDIR/tmp/usr/sbin/ $CDDIR/ || exit 1 - copy_files $WORKDIR/tmp/usr/bin/ $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 + copy_files $TMPDIR/usr/sbin/ $CDDIR/ || exit 1 + copy_files $TMPDIR/usr/bin/ $CDDIR/ || exit 1 copy_files /usr/share/alsa/ $CDDIR/usr/share/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 # rm -rf /usr/include/alsa # rm -rf /usr/share/alsa fi Index: tftp-hpa =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/tftp-hpa,v retrieving revision 1.1.2.3 ret... [truncated message content] |
|
From: Heiko Z. <smi...@us...> - 2008-02-21 20:32:54
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13009 Modified Files: Mail-SpamAssassin php samba sysstat xmbmon Log Message: make things thread safe again Index: samba =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/samba,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- samba 4 Oct 2005 02:49:43 -0000 1.27 +++ samba 21 Feb 2008 20:32:47 -0000 1.28 @@ -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: xmbmon =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xmbmon,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- xmbmon 15 Jan 2006 11:33:31 -0000 1.2 +++ xmbmon 21 Feb 2008 20:32:47 -0000 1.3 @@ -37,26 +37,26 @@ install ) if [ "$CONFIG_XMBMON" = "y" ]; then echo "install process" - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr/sbin || exit 1 - mkdir -p $WORKDIR/tmp/usr/share/man/man1 || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr/sbin || exit 1 + mkdir -p $TMPDIR/usr/share/man/man1 || exit 1 EXTRA="" if [ "$CONFIG_RRDTOOL" = "y" ];then - cp ./mbmon-rrd.pl $WORKDIR/tmp/usr/sbin || exit 1 + cp ./mbmon-rrd.pl $TMPDIR/usr/sbin || exit 1 fi -# make install DESTDIR=$WORKDIR/tmp PREFIX=/usr MANDIR=/usr/share/man || exit 1 +# make install DESTDIR=$TMPDIR PREFIX=/usr MANDIR=/usr/share/man || exit 1 - install -o root -g wheel -m 4555 -c -p mbmon $WORKDIR/tmp/usr/sbin + install -o root -g wheel -m 4555 -c -p mbmon $TMPDIR/usr/sbin gzip -S .gz -9 mbmon.1 - install -o root -g wheel -m 4555 -c -p mbmon.1.gz $WORKDIR/tmp/usr/share/man/man1 + install -o root -g wheel -m 4555 -c -p mbmon.1.gz $TMPDIR/usr/share/man/man1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - 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/lib/*a || exit 1 + copy_files $TMPDIR/usr $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: php =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- php 5 Apr 2006 19:19:23 -0000 1.15 +++ php 21 Feb 2008 20:32:47 -0000 1.16 @@ -46,20 +46,20 @@ install ) if [ "$CONFIG_PHP" = "y" ]; then - rm -rf $WORKDIR/tmp - mkdir -p $WORKDIR/tmp/etc - cp -dpR $ETCDIR/etc/apache2 $WORKDIR/tmp/etc - make install INSTALL_ROOT=$WORKDIR/tmp - replace_str $WORKDIR/tmp/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr - rm $WORKDIR/tmp/etc/apache2/httpd.conf.bak - rm $WORKDIR/tmp/etc/apache2/httpd.conf.old - cp -dp $WORKDIR/tmp/etc/apache2/httpd.conf $ETCDIR/etc/apache2/ + rm -rf $TMPDIR + mkdir -p $TMPDIR/etc + cp -dpR $ETCDIR/etc/apache2 $TMPDIR/etc + make install INSTALL_ROOT=$TMPDIR + replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr + rm $TMPDIR/etc/apache2/httpd.conf.bak + rm $TMPDIR/etc/apache2/httpd.conf.old + cp -dp $TMPDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/ cp -dp php.ini-dist $ETCDIR/etc/php.ini || exit 1 - rm -rf $WORKDIR/tmp/usr/include || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 - copy_docs $WORKDIR/tmp/ - cp -dpR $WORKDIR/tmp/usr/* $CDDIR/usr/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/include || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + copy_docs $TMPDIR/ + cp -dpR $TMPDIR/usr/* $CDDIR/usr/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: sysstat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysstat,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- sysstat 11 May 2007 15:29:27 -0000 1.13 +++ sysstat 21 Feb 2008 20:32:47 -0000 1.14 @@ -36,14 +36,14 @@ install ) if [ "$CONFIG_SYSSTAT" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - make install DESTDIR=$WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || 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: Mail-SpamAssassin =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Mail-SpamAssassin 23 Oct 2006 16:54:55 -0000 1.12 +++ Mail-SpamAssassin 21 Feb 2008 20:32:47 -0000 1.13 @@ -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 + # now override the PREFIX setting to not use $TMPDIR%. MakeMaker # does not have a better way to do this, it seems... make $PMAKE PREFIX=/usr || exit 1 make $PMAKE spamd/libspamc.so || exit 1 @@ -39,20 +39,20 @@ install ) if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR || exit 1 make install || exit 1 - install -m 0755 spamd/libspamc.so $WORKDIR/tmp/usr/lib || exit 1 + install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1 - cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1 + cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 - rm -rf $WORKDIR/tmp/usr/share/ || exit 1 + copy_docs $TMPDIR + cp -dpR $TMPDIR/usr/share/spamassassin $CDDIR/usr/share/ || exit 1 + rm -rf $TMPDIR/usr/share/ || 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 cp $MYDIR/scripts/spamd $ETCDIR/etc/init.d || exit 1 |
2 messages has been excluded from this view by a project administrator.
