Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17645/scripts
Modified Files:
Tag: rel-1-2-patches
gcc glibc minicom open-vm-tools sg3_utils squidguard
Log Message:
- updated cracklib to 2.8.12
- updated dar to 2.3.6
- updated db to 4.6.21
- updated freetype to 2.3.5
- updated glib to 2.14.2
- updated glibc to 2.3.6
- updated heartbeat to 2.1.2
- updated l7-protocols to 2007-10-10
- updated libpng to 1.2.22
- updated libxslt to 1.1.22
- updated mdadm to 2.6.4
- updated minicom-2.3 to rc1
- updated nasm to 0.99.05
- updated netfilter-layer7 to v2.14
- updated nfs-utils to 1.1.1
- updated php to 5.2.4
- updated sg3_utils to 1.25
- updated shorewall-common to 4.0.4
- updated shorewall-perl to 4.0.4
- updated shorewall-shell to 4.0.4
- updated squidGuard to 1.2.1
- updated sudo to 1.6.9p6
- updated syslinux to 3.52
- updated sysstat to 8.0.1
Index: open-vm-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Attic/open-vm-tools,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- open-vm-tools 13 Oct 2007 22:03:58 -0000 1.1.2.1
+++ open-vm-tools 20 Oct 2007 12:46:08 -0000 1.1.2.2
@@ -28,8 +28,9 @@
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
+ #make LDFLAGS=-liconv all || exit 1
+ make all || exit 1
+ echo "DONE"
exit 1
mkdir -p /lib/modules/$KERNELVERSION || exit 1
Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Attic/gcc,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- gcc 8 Feb 2004 15:12:16 -0000 1.22
+++ gcc 20 Oct 2007 12:46:08 -0000 1.22.2.1
@@ -61,7 +61,7 @@
fi
rm -rf ../gcc-build
- mkdir ../gcc-build || exit 1
+ mkdir ../gcc-build || exit 1
cd ../gcc-build || exit 1
../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \
--enable-threads=posix --with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu \
@@ -75,9 +75,7 @@
if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then
pushd $(find_src_dir et_dyn) > /dev/null
cd linux || exit 1
- GLIBC=$(find_src_dir glibc)
- GLIBC=${GLIBC##*/}
- cp $GLIBC/*.S . || exit 1
+ cp glibc-2.3.2/*.S . || exit 1
make || exit 1
GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name))
cp crt1S.o $GCCSPECDIR || exit 1
@@ -86,7 +84,7 @@
GCCVER=${GCCSPECDIR##*/}
test ! -f $GCCSPECDIR/specs.orig && cp $GCCSPECDIR/specs $GCCSPECDIR/specs.orig
echo $GCCSPECDIR/
- bzcat $DL_DIR/src/gcc-$GCCVER-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1
+ bzcat $DL_DIR/src/gcc-3*-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1
ln -sf specs.orig $GCCSPECDIR/specs || exit 1
ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1
fi
Index: minicom
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/minicom,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- minicom 11 Jan 2004 14:43:04 -0000 1.5
+++ minicom 20 Oct 2007 12:46:08 -0000 1.5.2.1
@@ -40,8 +40,6 @@
mkdir -p $WORKDIR/tmp || exit 1
make install DESTDIR=$WORKDIR/tmp || exit 1
mkdir -p $WORKDIR/tmp/usr/share/man || exit 1
- mv $WORKDIR/tmp/usr/man/* $WORKDIR/tmp/usr/share/man/ || exit 1
- copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
rm -rf $WORKDIR/tmp || exit 1
fi
;;
Index: sg3_utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sg3_utils,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- sg3_utils 11 Jan 2004 14:43:05 -0000 1.9
+++ sg3_utils 20 Oct 2007 12:46:08 -0000 1.9.2.1
@@ -27,22 +27,22 @@
case $1 in
build )
if [ "$CONFIG_SG3_UTILS" = "y" ]; then
- disable_et_dyn
- make $PMAKE all || exit 1
- strip_debug
+ ./configure --prefix=/usr || exit 1
+ make $PMAKE all || exit 1
+ strip_debug
fi
;;
install )
if [ "$CONFIG_SG3_UTILS" = "y" ]; then
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp/usr/man/man8 || exit 1
- make install DESTDIR=$WORKDIR/tmp PREFIX=/usr || exit 1
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR/usr || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
- copy_docs $WORKDIR/tmp
- copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+ copy_docs $TMPDIR
+ copy_files $TMPDIR/usr $CDDIR/ || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR || exit 1
fi
;;
Index: squidguard
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- squidguard 6 Sep 2004 14:40:32 -0000 1.2.2.1
+++ squidguard 20 Oct 2007 12:46:08 -0000 1.2.2.2
@@ -25,11 +25,13 @@
MYNAME=SQUIDGUARD
+cd $(find_src_dir squidGuard)
+
case $1 in
build )
if [ "$CONFIG_SQUIDGUARD" = "y" ]; then
if [ ! -e .done_devil_patch ]; then
- zcat $DL_DIR/src/squidguard_1*diff.gz | patch -p1 || exit 1
+ #zcat $DL_DIR/src/squidguard_1*diff.gz | patch -p1 || exit 1
touch .done_devil_patch
fi
./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -d -r1.31.2.3 -r1.31.2.4
--- glibc 9 Aug 2007 12:57:42 -0000 1.31.2.3
+++ glibc 20 Oct 2007 12:46:08 -0000 1.31.2.4
@@ -49,28 +49,18 @@
rm -rf ../glibc-build
mkdir ../glibc-build || exit 1
cd ../glibc-build || exit 1
- # unfortunately we can only go as high as the host kernel version
-
- #KVER_RUN=$(cat /proc/sys/kernel/osrelease)
- #if [ "$KERNELVERSION" \> "$KVER_RUN" ]; then
- # KVER=$KVER_RUN
- #else
- # KVER=$KERNELVERSION
- #fi
# set the minimum kernel level, so our remote updates won't fail
KVER=2.4.22
- ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER --without-gd || exit 1
+ ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --enable-kernel=$KVER --without-gd || exit 1
make $PMAKE || exit 1
- #make || exit 1
strip_debug || exit 1
- # we have to install this immediately, because this is a library and could be needed by other sources
- make install || exit 1
- #make localedata/install-locales || exit 1
- ln -sf libdl.so.2 /lib/libdl.so || exit 1
+ # we have to install this immediately, because this is a library and will be needed by other sources
+
+ make install || exit 1
;;
install )
|
