Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23165/scripts
Modified Files:
busybox ebtables httpd ipsec-tools patch-o-matic prepare
Added Files:
jailkit
Log Message:
- syslog-ng now uses unix-dgram instead of unix-stream
- chroot jails don't use syslog-ng anymore, jk_socketd forwards the messages
- added jailkit 2.0
- updated linux-wlan-ng to 0.2.3
- updated ndiswrapper to 1.15
- updated ipsec-tools to 0.6.5
- updated db to 4.4.20
- updated glibc to 2.3.6
- updated httpd to 2.2.2
- updated heartbeat to 2.0.5
Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- httpd 10 Aug 2005 13:48:50 -0000 1.5
+++ httpd 4 May 2006 01:15:15 -0000 1.6
@@ -35,7 +35,7 @@
--enable-ssl=shared --enable-bucketeer --enable-http --enable-info --enable-cgi --enable-vhost-alias \
--enable-rewrite --enable-so --enable-dav --enable-dav-fs \
--enable-mods-shared=all --enable-suexec --with-suexec-caller=www \
- --enable-layout=Debian || exit 1
+ --enable-layout=Debian --enable-pie || exit 1
# not working --enable-ldap --enable-auth-ldap --enable-mem-cache
make $PMAKE all || exit 1
strip_debug
Index: ebtables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ebtables 10 Sep 2004 23:16:24 -0000 1.9
+++ ebtables 4 May 2006 01:15:15 -0000 1.10
@@ -38,7 +38,7 @@
set_kernel_option CONFIG_IP_NF_MATCH_PHYSDEV m
fi
set_all_kernel_options net/bridge/netfilter
- make MANDIR=/usr/share/man $PMAKE all|| exit 1
+ make MANDIR=/usr/share/man KERNEL_INCLUDES=/usr/src/linux/include $PMAKE all|| exit 1
strip_debug
fi
;;
Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- prepare 13 Dec 2005 10:12:15 -0000 1.59
+++ prepare 4 May 2006 01:15:15 -0000 1.60
@@ -34,19 +34,19 @@
case $1 in
prepare )
- if [ -d /usr/include/linux ] && [ ! -L /usr/include/linux ]; then
- echo "ERROR"
- echo "/usr/include/linux found and is a directory"
- echo "please remove or rename it"
- exit 1
- fi
+ #if [ -d /usr/include/linux ] && [ ! -L /usr/include/linux ]; then
+ # echo "ERROR"
+ # echo "/usr/include/linux found and is a directory"
+ # echo "please remove or rename it"
+ # exit 1
+ #fi
- if [ -d /usr/include/asm ] && [ ! -L /usr/include/asm ]; then
- echo "ERROR"
- echo "/usr/include/asm found and is a directory"
- echo "please remove or rename it"
- exit 1
- fi
+ #if [ -d /usr/include/asm ] && [ ! -L /usr/include/asm ]; then
+ # echo "ERROR"
+ # echo "/usr/include/asm found and is a directory"
+ # echo "please remove or rename it"
+ # exit 1
+ #fi
#if [ -d /usr/include/asm-generic ] && [ ! -L /usr/include/asm-generic ]; then
# echo "ERROR"
@@ -62,23 +62,23 @@
exit 1
fi
- if [ -e /usr/include/linux ]; then
- rm /usr/include/linux
- fi
+ #if [ -e /usr/include/linux ]; then
+ # rm /usr/include/linux
+ #fi
# let's find out if we force the usage of old kernel include files
# this is sometimes necessary, when they change too much in the new kernel
KERN_INC=$(find_src_dir kernel-includes)
- if [ -z "$KERN_INC" ]; then
- ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
- ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
- ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
- else
- ln -sf $KERN_INC/linux /usr/include/linux || exit 1
- ln -sf $KERN_INC/asm /usr/include/asm || exit 1
- ln -sf $KERN_INC/asm-generic /usr/include/asm-generic || exit 1
- fi
+ #if [ -z "$KERN_INC" ]; then
+ # ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
+ # ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
+ # ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
+ #else
+ # ln -sf $KERN_INC/linux /usr/include/linux || exit 1
+ # ln -sf $KERN_INC/asm /usr/include/asm || exit 1
+ # ln -sf $KERN_INC/asm-generic /usr/include/asm-generic || exit 1
+ #fi
ln -sf $KERNELDIR /usr/src/linux || exit 1
Index: busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/busybox,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- busybox 14 Apr 2006 15:48:40 -0000 1.25
+++ busybox 4 May 2006 01:15:15 -0000 1.26
@@ -25,9 +25,7 @@
case $1 in
build )
- #export PATH=$(ls -d /usr/*-linux-uclibc/usr/bin):$(ls -d /usr/*-linux-uclibc/lib):$PATH
cp $MYDIR/config/config_busybox .config
- #CROSS=$(ls -d /usr/*-linux-uclibc/bin)/i386-uclibc-
make CROSS=$CROSS oldconfig || exit 1
make CROSS=$CROSS dep || exit 1
make CROSS=$CROSS $PMAKE all || exit 1
Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- patch-o-matic 10 Dec 2005 15:35:07 -0000 1.29
+++ patch-o-matic 4 May 2006 01:15:15 -0000 1.30
@@ -36,7 +36,7 @@
if [ ! -f .done_layer7 ]; then
pushd $KERNEL_DIR > /dev/null
- patch -p1 < ../netfilter-layer7-*/kernel-2.6-layer7-*.patch || exit 1
+ patch -p1 < ../netfilter-layer7-*/kernel*2.6*layer7-*.patch || exit 1
popd > /dev/null
pushd $IPTABLES_DIR > /dev/null
Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ipsec-tools 30 Dec 2004 20:13:56 -0000 1.5
+++ ipsec-tools 4 May 2006 01:15:15 -0000 1.6
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# $Source$
# $Revision$
# $Date$
@@ -32,7 +32,8 @@
case $1 in
build )
./bootstrap
- ./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=$KERNELDIR/include
+ ./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=$KERNELDIR/include \
+ --enable-frag --enable-stats --enable-dpd --enable-natt || exit 1
make || exit 1
make install || exit 1
strip_debug
--- NEW FILE: jailkit ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/jailkit,v $
# $Revision: 1.2 $
# $Date: 2006/05/04 01:15:15 $
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
### BEGIN INIT INFO
# Provides: jailkit
# Required-Start: $libs
# Required-Stop:
# Default-Start: 1 2
# Default-Stop:
# Description: description
### END INIT INFO
# get the directoryname of the script
MYDIR=${0%/*}
# source functions and config
source $MYDIR/settings
case $1 in
build )
if [ ! -f devil-linux-patches.done ]; then
bzcat $DL_DIR/src/jailkit-2.0-destdir.patch.bz2 | patch -p1 || exit 1
bzcat $DL_DIR/src/jailkit-2.0-jk_socketd-param.patch.bz2 | patch -p1 || exit 1
touch devil-linux-patches.done
fi
./configure --prefix=/usr || exit 1
make $PMAKE || exit 1
strip_debug
;;
install )
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR/ || exit 1
make DESTDIR=$TMPDIR install || exit 1
cat $TMPDIR/etc/shells >> $ETCDIR/etc/shells || exit 1
rm $TMPDIR/etc/shells || exit 1
cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
copy_docs $TMPDIR
cp -dpvR $TMPDIR/usr $CDDIR/ || exit 1
rm -rf $TMPDIR || exit
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
|
