Menu
▾
▴
[Devil-linux-commit] build/scripts Python, 1.20, 1.20.2.1 clamav, 1.9.2.9, 1.9.2.10 freeradius, 1.1.2.5, 1.1.2.6 gawk, 1.8, 1.8.2.1 jailkit, 1.1.2.3, 1.1.2.4 syslinux, 1.18.2.1, 1.18.2.2 sysstat, 1.10, 1.10.2.1
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14436/scripts Modified Files: Tag: rel-1-2-patches Python clamav freeradius gawk jailkit syslinux sysstat Log Message: - updated Mail-SpamAssassin to 3.2.0 - updated clamav to 0.90.2 - updated curl to 7.16.2 - updated dnsmasq to 2.39 - updated dovecot to 1.0.0 - updated fetchmail to 6.3.8 - updated freeradius to 1.1.6 - updated freetype to 2.3.4 - updated glib to 2.12.12 - updated gnugk to 2.2.6 - updated gnupg to 1.4.7 - updated gradm to 2.1.10-200702231759 - updated grsecurity to 2.1.10-2.4.34.1-200702201442 - updated iptstate to 2.2.1 - updated lftp to 3.5.11 - updated libpcap to 0.9.5 - updated linux to 2.4.34.4 - updated lm_sensors to 2.10.3 - updated mhash to 0.9.9 - updated mrtg to 2.15.2 - updated netacct-mysql to 0.78 - updated openldap to 2.3.35 - updated pciutils to 2.2.5 - updated pcre to 7.1 - updated pptpd to 1.3.4 - updated psmisc to 22.5 - updated rrdtool to 1.2.23 - updated sysstat to 7.1.4 - updated tcpdump to 3.9.5 Index: syslinux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -d -r1.18.2.1 -r1.18.2.2 --- syslinux 21 Jan 2005 01:50:28 -0000 1.18.2.1 +++ syslinux 11 May 2007 14:46:58 -0000 1.18.2.2 @@ -49,7 +49,7 @@ mkdir -p $CDDIR/boot/syslinux || exit 1 cp -v ldlinux.bss $CDDIR/boot/syslinux || exit 1 cp -v ldlinux.sys $CDDIR/boot/syslinux || exit 1 - cp -v mbr.bin $CDDIR/boot/syslinux || exit 1 + cp -v mbr/mbr.bin $CDDIR/boot/syslinux || exit 1 cp -v unix/syslinux $CDDIR/boot/syslinux || exit 1 ;; Index: Python =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Python,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -d -r1.20 -r1.20.2.1 --- Python 28 Feb 2004 16:15:24 -0000 1.20 +++ Python 11 May 2007 14:46:58 -0000 1.20.2.1 @@ -39,8 +39,8 @@ strip_debug # we need to install it, because Python-LDAP needs it make install || exit 1 - ln -sf python2.3 $WORKDIR/Python-install/usr/bin/python || exit 1 - ln -sf python2.3 $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 @@ -49,7 +49,7 @@ install ) if [ "$CONFIG_PYTHON" = "y" ]; then - copy_docs $WORKDIR/Python-install + copy_docs $WORKDIR/Python-install rm -rf $WORKDIR/Python-install/usr/include || exit 1 find $WORKDIR/Python-install/usr/ -name *.pyc | xargs rm find $WORKDIR/Python-install/usr/ -name *.pyo | xargs rm Index: clamav =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/clamav,v retrieving revision 1.9.2.9 retrieving revision 1.9.2.10 diff -u -d -r1.9.2.9 -r1.9.2.10 --- clamav 28 Dec 2006 15:37:28 -0000 1.9.2.9 +++ clamav 11 May 2007 14:46:58 -0000 1.9.2.10 @@ -25,13 +25,13 @@ case $1 in build ) if [ "$CONFIG_CLAMAV" = "y" ]; then - if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then - bzcat $SRCDIR/clamav-*-libunrar3.patch.bz2 | patch -p1 || exit 1 - bzcat $SRCDIR/clamav-*-un7zip.patch.bz2 | patch -p1 || exit 1 - aclocal - autoconf - automake - fi + #if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then + # bzcat $SRCDIR/clamav-*-libunrar3.patch.bz2 | patch -p1 || exit 1 + # bzcat $SRCDIR/clamav-*-un7zip.patch.bz2 | patch -p1 || exit 1 + # aclocal + # autoconf + # automake + #fi ./configure --prefix=/usr --sysconfdir=/etc --disable-clamav --with-dbdir=/var/lib/clamav || exit 1 make $PMAKE all || exit 1 Index: gawk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gawk,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- gawk 11 Jan 2004 14:43:04 -0000 1.8 +++ gawk 11 May 2007 14:46:58 -0000 1.8.2.1 @@ -25,32 +25,44 @@ case $1 in build ) + if [ ! -f .DL-patch.done ]; then + bzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.bz2 | patch -p1 || exit 1 + touch .DL-patch.done + fi ./configure --prefix=/usr --libexecdir=/usr/bin --disable-nls || exit 1 make $PMAKE all || exit 1 strip_debug + + # install the updated version + rm -rf /usr/bin/awk + mkdir /usr/bin/awk + make install || exit 1 + rm -rf /usr/bin/awk + rm -rf $TMPDIR/usr/bin/awk + ln -sf gawk /usr/bin/awk || exit 1 ;; install ) - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp/usr || exit 1 + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR/usr || exit 1 rm -rf /usr/bin/awk mkdir /usr/bin/awk make install || exit 1 - make install prefix=$WORKDIR/tmp/usr || exit 1 + make install prefix=$TMPDIR/usr || exit 1 rm -rf /usr/bin/awk - rm -rf $WORKDIR/tmp/usr/bin/awk + rm -rf $TMPDIR/usr/bin/awk ln -sf gawk /usr/bin/awk || exit 1 - copy_docs $WORKDIR/tmp + copy_docs $TMPDIR - rm -rf $WORKDIR/tmp/usr/bin/*awk-* || exit 1 - cp -dpR $WORKDIR/tmp/usr/share/* $CDDIR/usr/share/ || exit 1 - rm -rf $WORKDIR/tmp/usr/share || exit 1 - ln -sf gawk $WORKDIR/tmp/usr/bin/awk || exit 1 - cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 - rm -rf $WORKDIR/tmp || exit 1 + rm -rf $TMPDIR/usr/bin/*awk-* || exit 1 + cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share/ || exit 1 + rm -rf $TMPDIR/usr/share || exit 1 + ln -sf gawk $TMPDIR/usr/bin/awk || exit 1 + cp -dpR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 ;; * ) Index: sysstat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysstat,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- sysstat 11 Jan 2004 14:43:05 -0000 1.10 +++ sysstat 11 May 2007 14:46:58 -0000 1.10.2.1 @@ -28,6 +28,7 @@ build ) if [ "$CONFIG_SYSSTAT" = "y" ]; then cp $DL_DIR/scripts/config/config_sysstat ./build/CONFIG || exit 1 + ./configure --prefix=/usr --disable-nls || exit 1 make $PMAKE all || exit 1 strip_debug fi Index: jailkit =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/jailkit,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- jailkit 4 May 2006 02:21:28 -0000 1.1.2.3 +++ jailkit 11 May 2007 14:46:58 -0000 1.1.2.4 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: jailkit -# Required-Start: $libs +# Required-Start: $libs Python # Required-Stop: # Default-Start: 1 2 # Default-Stop: Index: freeradius =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/freeradius,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- freeradius 13 Jun 2006 12:35:19 -0000 1.1.2.5 +++ freeradius 11 May 2007 14:46:58 -0000 1.1.2.6 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: freeradius -# Required-Start: $basebuildtools $libs +# Required-Start: $basebuildtools $libs perl Python Linux-PAM # Required-Stop: # Default-Start: 1 2 # Default-Stop: @@ -28,10 +28,18 @@ case $1 in build ) if [ "$CONFIG_FREERADIUS" = "y" ]; then - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-shared --with-system-libtool || exit 1 #--with-rlm-krb5-include-dir=/usr/include/heimdal || exit 1 make all || exit 1 strip_debug + + # make sure this variable uses the correct perl version + PERLVER=$(ls -d /usr/lib/perl5/5.*) + PERLVER=${PERLVER##/*/} + PERLDIR=$(ls -d /usr/lib/perl5/5.*/i*linux*) + PERLDIR=${PERLDIR##/*/} + replace_str src/modules/rlm_perl/rlm_perl.la 5.8.0 $PERLVER + replace_str src/modules/rlm_perl/rlm_perl.la i486-linux $PERLDIR fi ;; |
