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
|
