|
From: Heiko Z. <smi...@us...> - 2008-07-14 12:45:38
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26129/scripts Modified Files: Tag: rel-1-2-patches Python bind Log Message: - updated clamav-0.93.3 - updated i2c-2.10.5 - updated lm_sensors-2.10.7 - updated sysstat-8.1.4 - updated bind to 9.5.0-P1 Index: Python =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Python,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -u -d -r1.20.2.1 -r1.20.2.2 --- Python 11 May 2007 14:46:58 -0000 1.20.2.1 +++ Python 14 Jul 2008 12:45:32 -0000 1.20.2.2 @@ -39,11 +39,13 @@ strip_debug # we need to install it, because Python-LDAP needs it make install || exit 1 + #ln -sf python2.5 $WORKDIR/Python-install/usr/bin/python || exit 1 + #ln -sf python2.5 $WORKDIR/Python-install/usr/bin/python2 || exit 1 ln -sf python2.4 $WORKDIR/Python-install/usr/bin/python || exit 1 ln -sf python2.4 $WORKDIR/Python-install/usr/bin/python2 || exit 1 mkdir -p $WORKDIR/Python-install/usr/share mv $WORKDIR/Python-install/usr/man $WORKDIR/Python-install/usr/share - cp -dpR $WORKDIR/Python-install/* / || exit 1 + cp -dfpR $WORKDIR/Python-install/* / || exit 1 fi ;; Index: bind =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bind,v retrieving revision 1.30.2.2 retrieving revision 1.30.2.3 diff -u -d -r1.30.2.2 -r1.30.2.3 --- bind 21 Feb 2008 20:34:37 -0000 1.30.2.2 +++ bind 14 Jul 2008 12:45:32 -0000 1.30.2.3 @@ -28,7 +28,11 @@ case $1 in build ) if [ "$CONFIG_ISC_BIND" = "y" ]; then - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl --enable-libbind --enable-threads --with-libtool || exit 1 + # don't compile the tests, they'll fail with the forced -pie + replace_str bin/Makefile.in "tests" "" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl \ + --with-pic --enable-threads --with-libtool || exit 1 make depend || exit 1 #make $PMAKE all || exit 1 make all || exit 1 @@ -61,7 +65,6 @@ cp $MYDIR/scripts/root.hint $ETCDIR/etc/named/ || exit 1 cp $MYDIR/scripts/named.local $ETCDIR/etc/named/ || exit 1 cp $MYDIR/scripts/localhost.zone $ETCDIR/etc/named/ || exit 1 - rm -rf $TMPDIR || exit 1 getent passwd named >/dev/null |