Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14627/scripts
Modified Files:
Tag: rel-1-2-patches
bridge-utils build.sh e2fsprogs nagios-plugins nail nut p7zip
Log Message:
- updated acl_2.2.47-1
- updated attr_2.4.41
- updated bzip2-1.0.5
- updated lm_sensors-2.10.6
- updated dovecot-1.0.13
- updated openssh-5.0p1
- updated shorewall-shell-4.0.10
- updated nagios-3.0.1
- updated nagios-plugins-1.4.11
- updated nrpe-2.12
- updated nsca-2.7.2
- updated postgresql-8.3.1
- updated rsync-3.0.2
- updated smartmontools-5.38
- updated tar-1.20
- updated wget-1.11.2
- updated nagios-plugin-pgsql_include_for_8.3
- updated linux-2.4.36.4
- updated pax-linux-2.4.36.4-test1
- updated bridge-utils-1.4
- updated cyrus-imapd-2.3.12p2
- updated device-mapper.1.02.25
- updated gnupg-1.4.9
- updated krb5-1.6.3
- updated libpcap-0.9.8
- updated libpng-1.2.29
- updated lzo-2.03
- updated nmap-4.62
- updated openldap-2.4.9
- updated pcre-7.7
- updated samba-3.0.28a
- updated snort-2.8.1
- updated squid-3.0.STABLE5
- updated tcpdump-3.9.8
- updated xfsprogs_2.9.8-1
- updated open-vm-tools-2008.04.14-87182
- updated grsecurity-2.1.12-2.4.36.4-200805181025
- updated libxml2-2.6.30
- updated libxslt-1.1.24
- updated nut-2.2.2
- updated p7zip_4.57-libun7zip
- updated p7zip_4.57_src_all
- updated php-5.2.6
- updated scponly-20080308
- updated shorewall-perl-4.0.10.1
- updated shorewall-common-4.0.10.1
- updated sudo-1.6.9p16
- updated stunnel-4.24
- updated e2fsprogs-1.40.8
Index: nagios-plugins
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nagios-plugins,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- nagios-plugins 20 Aug 2006 19:49:56 -0000 1.1.2.1
+++ nagios-plugins 30 May 2008 15:00:39 -0000 1.1.2.2
@@ -27,6 +27,10 @@
case $1 in
build )
if [ "$CONFIG_NAGIOS" = "y" ]; then
+ if [ ! -f devil-linux-patch.done ]; then
+ bzcat $SRCDIR/nagios-plugin-pgsql_include_for_8.3.patch.bz2 | patch -p1 || exit 1
+ touch devil-linux-patch.done
+ fi
./configure --prefix=/usr --libexecdir=/usr/libexec/nagios --disable-rpath || exit 1
make $PMAKE all || exit 1
strip_debug
Index: bridge-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bridge-utils,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- bridge-utils 21 Feb 2008 20:34:37 -0000 1.14.2.1
+++ bridge-utils 30 May 2008 15:00:39 -0000 1.14.2.2
@@ -28,6 +28,7 @@
case $1 in
build )
if [ "$CONFIG_BRIDGE_UTILS" = "y" ]; then
+ autoconf || exit 1
./configure --prefix=/usr || exit 1
make $PMAKE all|| exit 1
strip_debug
Index: nut
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nut,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- nut 15 Apr 2006 01:23:09 -0000 1.1.2.1
+++ nut 30 May 2008 15:00:39 -0000 1.1.2.2
@@ -35,7 +35,7 @@
#fi
./configure --prefix=/usr --sysconfdir=/etc/ups --with-statepath=/var/lib/ups \
- --with-user=nut \
+ --with-user=nut --with-group=nut\
--with-gd-includes --with-gd-libs || exit 1
make $PMAKE || exit 1
strip_debug
Index: e2fsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e2fsprogs,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -d -r1.17.2.7 -r1.17.2.8
--- e2fsprogs 22 Feb 2007 17:30:50 -0000 1.17.2.7
+++ e2fsprogs 30 May 2008 15:00:39 -0000 1.17.2.8
@@ -25,7 +25,7 @@
case $1 in
build )
- ./configure --prefix= --disable-nls --enable-elf-shlibs || exit 1
+ ./configure --prefix= --disable-nls --enable-elf-shlibs --disable-tls || exit 1
make $PMAKE all || exit 1
strip_debug
# make sure the system has the actual files
Index: nail
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nail,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- nail 21 Feb 2008 20:34:37 -0000 1.13.2.1
+++ nail 30 May 2008 15:00:39 -0000 1.13.2.2
@@ -28,8 +28,8 @@
case $1 in
build )
if [ "$CONFIG_NAIL" = "y" ]; then
- ./configure --prefix=/usr --with-rcfile=/etc/nail.rc --enable-all-chars || exit 1
- make $PMAKE all || exit 1
+ # doesn't like parallel builds
+ make all PREFIX=/usr SYSCONFDIR=/etc || exit 1
strip_debug
fi
;;
@@ -39,7 +39,7 @@
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR || exit 1
mkdir -p $TMPDIR/etc || exit 1
- make install DESTDIR=$TMPDIR || exit 1
+ make install PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR UCBINSTALL=/usr/bin/install || exit 1
copy_docs $TMPDIR
ln -sf nail $TMPDIR/usr/bin/mail
ln -sf nail $TMPDIR/usr/bin/mailx
Index: p7zip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/p7zip,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- p7zip 7 Feb 2007 16:29:14 -0000 1.1.2.4
+++ p7zip 30 May 2008 15:00:39 -0000 1.1.2.5
@@ -26,10 +26,19 @@
case $1 in
build )
if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
- bzcat $SRCDIR/p7zip_*-libun7zip.patch.bz2 | patch -p1 || exit 1
- pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1
- make $PMAKE || exit 1
-# We should install libs immediately
+ if [ ! -f .dl_patches_done ]; then
+ bzcat $SRCDIR/p7zip_*-libun7zip.patch.bz2 | patch -p1 || exit 1
+ touch .dl_patches_done
+ fi
+ #cp makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine || exit 1
+ #cp makefile.linux_x86_ppc_alpha makefile.machine || exit 1
+
+ pushd CPP/7zip/Bundles/Un7Zip > /dev/null || exit 1
+
+ #make CXX=/opt/gcc-3.x/bin/g++ $PMAKE || exit 1
+ make all $PMAKE || exit 1
+
+ # We should install libs immediately
install -s -D -m 755 libun7zip.so /usr/lib/libun7zip.so || exit 1
install -D -m 644 u7zip.h /usr/include/u7zip.h || exit 1
popd > /dev/null || exit 1
@@ -38,7 +47,7 @@
install )
if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
- install -s -D -m 755 7zip/Bundles/Un7Zip/libun7zip.so $CDDIR/usr/lib/libun7zip.so || exit 1
+ install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so $CDDIR/usr/lib/libun7zip.so || exit 1
fi
;;
Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.79.2.10
retrieving revision 1.79.2.11
diff -u -d -r1.79.2.10 -r1.79.2.11
--- build.sh 25 May 2006 18:29:30 -0000 1.79.2.10
+++ build.sh 30 May 2008 15:00:39 -0000 1.79.2.11
@@ -62,6 +62,7 @@
cp $KERNELDIR/.config $DISTDIR/DL-kernel-config || exit 1
sort $DL_DIR/.config | uniq > $DISTDIR/DL-build-config || exit 1
cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1
+ cp $DL_DIR/scripts/scripts/rass $DISTDIR || exit 1
cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1
cp $WORKDIR/bootcd.iso $DISTDIR || exit 1
if [ "$CONFIG_ZISOFS" = "y" ]; then
|
