Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23790/scripts
Modified Files:
Linux-PAM cyrus-imapd linux patch-o-matic pptp-patches
sg3_utils squidguard syslinux
Log Message:
- updated unionfs to 2.1.7_for_2.6.23.1
- updated patch-o-matic-ng to 20071022
- updated ndiswrapper to 1.48
- updated postgresql to 8.2.5
- updated linux to 2.6.31.1
- 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 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
- updated cyrus-imapd to 2.3.9
- added open-vm-tools SVN-2007.10.08 (not working yet)
Index: Linux-PAM
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Linux-PAM,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Linux-PAM 15 Jun 2006 19:31:06 -0000 1.5
+++ Linux-PAM 23 Oct 2007 18:06:29 -0000 1.6
@@ -26,7 +26,7 @@
case $1 in
build )
- bzcat $SRCDIR/Linux-PAM-0.99.2.1.patch.bz2 | patch -p1
+ #bzcat $SRCDIR/Linux-PAM-0.99.2.1.patch.bz2 | patch -p1
# Linux-PAM-0.99.2.1/modules/pam_echo/pam_echo.c
#
# #ifndef HOST_NAME_MAX
Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- syslinux 6 Jul 2007 14:43:25 -0000 1.22
+++ syslinux 23 Oct 2007 18:06:29 -0000 1.23
@@ -32,7 +32,7 @@
fi
if [ "$CONFIG_GCC_HARDENED" = "y" ]; then
- make $PMAKE CC="gcc -nopie -fno-stack-protector" install|| exit 1
+ make $PMAKE CC="gcc -U_FORTIFY_SOURCE -nopie -fno-stack-protector" install|| exit 1
else
make $PMAKE install|| exit 1
fi
Index: sg3_utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sg3_utils,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sg3_utils 1 May 2007 00:30:31 -0000 1.12
+++ sg3_utils 23 Oct 2007 18:06:29 -0000 1.13
@@ -27,17 +27,17 @@
case $1 in
build )
if [ "$CONFIG_SG3_UTILS" = "y" ]; then
- #replace_str Makefile "CFLAGS = " "CFLAGS = -no-pie "
- 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 $TMPDIR || exit 1
- mkdir -p $TMPDIR/usr/man/man8 || exit 1
- make install DESTDIR=$TMPDIR PREFIX=/usr || exit 1
+ mkdir -p $TMPDIR/usr || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
copy_docs $TMPDIR
copy_files $TMPDIR/usr $CDDIR/ || exit 1
Index: squidguard
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- squidguard 28 Jul 2005 15:54:39 -0000 1.5
+++ squidguard 23 Oct 2007 18:06:29 -0000 1.6
@@ -25,14 +25,16 @@
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
- CC="gcc -lpthread" ./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
+ ./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
make $PMAKE all || exit 1
strip_debug
fi
Index: pptp-patches
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pptp-patches,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pptp-patches 6 Jul 2007 04:19:17 -0000 1.20
+++ pptp-patches 23 Oct 2007 18:06:29 -0000 1.21
@@ -29,9 +29,8 @@
if [ "$CONFIG_POPTOP" = "y" ] || [ "$CONFIG_PPTP_CLIENT" = "y" ]; then
pushd $KERNELDIR || exit 1
- bzcat $SRCDIR/linux-2.6.*-mppe-mppc-*.patch.bz2 | patch -p1 || exit 1
-
- echo "CONFIG_PPP_MPPE_MPPC=m" >> $KERNELDIR/.config || exit 1
+ #bzcat $SRCDIR/linux-2.6.*-mppe-mppc-*.patch.bz2 | patch -p1 || exit 1
+ #echo "CONFIG_PPP_MPPE_MPPC=m" >> $KERNELDIR/.config || exit 1
fi
fi
;;
Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- linux 31 Jul 2007 13:23:29 -0000 1.61
+++ linux 23 Oct 2007 18:06:29 -0000 1.62
@@ -40,8 +40,8 @@
fi
make oldconfig
- make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE bzImage || exit 1
- make CC="gcc -D_FORTIFY_SOURCE=0" $PMAKE modules || exit 1
+ make CC="gcc -U_FORTIFY_SOURCE" $PMAKE bzImage || exit 1
+ make CC="gcc -U_FORTIFY_SOURCE" $PMAKE modules || exit 1
;;
Index: cyrus-imapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cyrus-imapd 4 Oct 2005 02:49:42 -0000 1.28
+++ cyrus-imapd 23 Oct 2007 18:06:29 -0000 1.29
@@ -10,7 +10,7 @@
### BEGIN INIT INFO
# Provides: cyrus-imapd
-# Required-Start: $basebuildtools $libs e2fsprogs
+# Required-Start: $basebuildtools $libs e2fsprogs perl
# Required-Stop:
# Default-Start: 1 2
# Default-Stop:
@@ -25,6 +25,8 @@
MYNAME=CYRUS_IMAPD
+PERLDIR=$(ls -d /usr/lib/perl5/5.*/i*linux*)
+
case $1 in
build )
if [ "$CONFIG_CYRUS_IMAPD" = "y" ]; then
@@ -41,7 +43,7 @@
--with-auth=unix --enable-listext --enable-annotatemore --enable-fulldirhash --enable-sieve || exit 1
make depend
# parallel build fails, do not use $PMAKE
- make all DESTDIR=$TMPDIR || exit 1
+ make all || exit 1
strip_debug
#install it, we need it later
Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- patch-o-matic 31 Jul 2007 11:07:08 -0000 1.33
+++ patch-o-matic 23 Oct 2007 18:06:29 -0000 1.34
@@ -34,10 +34,10 @@
#L7
if [ "$CONFIG_NF_LAYER7" = "y" ]; then
- if [ ! -f .done_layer7 ]; then
+ if [ ! -f $KERNEL_DIR/.done_layer7 ]; then
pushd $KERNEL_DIR > /dev/null
-# patch -p1 < ../netfilter-layer7-*/kernel*2.6*layer7-*.patch || exit 1
- patch -p1 < ../netfilter-layer7-*/for_older_kernels/kernel-2.6.20-2.6.21*layer7-*.patch || exit 1
+ patch -p1 < ../netfilter-layer7-*/kernel*2.6*layer7-*.patch || exit 1
+# patch -p1 < ../netfilter-layer7-*/for_older_kernels/kernel-2.6.20-2.6.21*layer7-*.patch || exit 1
popd > /dev/null
pushd $IPTABLES_DIR > /dev/null
@@ -45,7 +45,7 @@
patch -p1 < ../netfilter-layer7-*/iptables-*2.6.20forward-layer7*.patch || exit 1
chmod +x extensions/.layer7-test || exit 1
popd > /dev/null
- touch .done_layer7
+ touch $KERNEL_DIR/.done_layer7
fi
fi
|
