Menu
▾
▴
[Devil-linux-commit] build/scripts libconfig, NONE, 1.1 libnetfilter_cttimeout, NONE, 1.1 mod_spdy, NONE, 1.1 pam-abl, NONE, 1.1 create_cd_dirs, 1.40, 1.41 httpd, 1.18, 1.19 iproute2, 1.37, 1.38 iptables, 1.40, 1.41 libnetfilter_conntrack, 1.8, 1.9 shellinabox, 1.2, 1.3
|
From: Heiko Z. <smi...@us...> - 2012-08-09 12:45:15
|
Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv17566/scripts
Modified Files:
create_cd_dirs httpd iproute2 iptables libnetfilter_conntrack
shellinabox
Added Files:
libconfig libnetfilter_cttimeout mod_spdy pam-abl
Log Message:
- updated bacula-5.2.10
- updated busybox-1.20.2
- updated clamav-0.97.5
- updated conntrack-tools-1.2.2
- updated dhcp-4.2.4
- updated dovecot-2.1.9
- updated gnutls-2.12.20
- updated gradm-2.9.1-201207201554
- updated grsecurity-2.9.1-3.2.26-201208062017
- updated iproute2-3.5.0
- updated ipset-6.13
- updated iptables-1.4.15
- updated libconfig-1.4.8
- updated libmnl-1.0.3
- updated libnetfilter_conntrack-1.0.1
- added libnetfilter_cttimeout-1.0.0
- updated mysql-5.5.27
- updated p11-kit-0.13
- updated linux to 3.2.26
- updated php-5.3.15
- updated postfix-2.9.4
- updated tiff-4.0.2
- use mount --bind for /jail instead of symlink
- added mod_spdy svn-20120707
- added pam-abl git-20120708
Index: iptables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptables,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- iptables 4 Feb 2012 21:26:54 -0000 1.40
+++ iptables 9 Aug 2012 12:45:12 -0000 1.41
@@ -19,9 +19,9 @@
build )
FLAGS="-O2"
- patch_from_file 1 $DL_DIR/src/iptables-*-imq.patch.bz2 || exit 1
- chmod +x extensions/.IMQ-test*
- patch_from_file 1 $DL_DIR/src/iptables-linux_3.2_compat.patch.xz || exit 1
+ #patch_from_file 1 $DL_DIR/src/iptables-*-imq.patch.bz2 || exit 1
+ #chmod +x extensions/.IMQ-test*
+ #patch_from_file 1 $DL_DIR/src/iptables-linux_3.2_compat.patch.xz || exit 1
./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel || exit 1
#replace_str Makefile "/usr/local" "/usr"
--- NEW FILE: pam-abl ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/pam-abl,v $
# $Revision: 1.1 $
# $Date: 2012/08/09 12:45:12 $
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
# get the directoryname of the script
MYDIR=${0%/*}
# source functions and config
source $MYDIR/settings
case $1 in
build )
cmake . || exit 1
make $PMAKE || exit 1
;;
install )
install -c -m 755 -o root pam-abl.so $CDDIR/lib/security/ || exit 1
install -c -m 755 -o root pam-abl $CDDIR/lib/security/ || exit 1
install -c -m 755 -o root conf/pam_abl.conf $ETCDIR/etc/security/ || exit 1
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- httpd 5 Dec 2011 09:11:38 -0000 1.18
+++ httpd 9 Aug 2012 12:45:12 -0000 1.19
@@ -68,9 +68,15 @@
PARAMS="$PARAMS --enable-ssl=shared"
PARAMS="$PARAMS --enable-mods-shared=all --enable-layout=Debian"
PARAMS="$PARAMS --with-pcre"
- if "${CONFIG_GCC_HARDENED}" = "y" ]; then
+ if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then
PARAMS="$PARAMS --enable-pie"
fi
+
+ if [ "$CONFIG_MOD_SPDY" = "y" ]; then
+ MOD_SPDY_DIR=$(find_src_dir mod_spdy)
+ patch_from_file 0 ${MOD_SPDY_DIR}/scripts/mod_ssl_with_npn.patch || exit 1
+ fi
+
./configure $PARAMS || exit 1
make $PMAKE all || exit 1
Index: libnetfilter_conntrack
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/libnetfilter_conntrack,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libnetfilter_conntrack 5 Dec 2011 09:11:38 -0000 1.8
+++ libnetfilter_conntrack 9 Aug 2012 12:45:12 -0000 1.9
@@ -16,8 +16,6 @@
case $1 in
build )
- ./autogen.sh
- delete_str ./libnetfilter_conntrack.pc.in "^URL: " || exit 1
./configure --prefix=/usr || exit 1
make $PMAKE all || exit 1
--- NEW FILE: mod_spdy ---
#!/bin/bash
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
# get the directoryname of the script
MYDIR=${0%/*}
# source functions and config
source $MYDIR/settings
case $1 in
build )
if [ "$CONFIG_HTTPD" = "y" ]; then
if [ "$CONFIG_MOD_SPDY" = "y" ]; then
make BUILDTYPE=Release || exit 1
fi
fi
;;
install )
if [ "$CONFIG_HTTPD" = "y" ]; then
if [ "$CONFIG_MOD_SPDY" = "y" ]; then
cp out/Release/libmod_diagnostics.so $CDDIR/usr/lib/apache2/modules/mod_diagnostics.so || exit 1
cp out/Release/libmod_spdy.so $CDDIR/usr/lib/apache2/modules/mod_spdy.so || exit 1
fi
fi
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
Index: shellinabox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shellinabox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shellinabox 30 May 2012 12:17:34 -0000 1.2
+++ shellinabox 9 Aug 2012 12:45:12 -0000 1.3
@@ -39,7 +39,7 @@
echo "START_SHELLINABOX=no" >> $CONFIGFILE
echo >> $CONFIGFILE
echo "# additional command line options for shellinabox" >> $CONFIGFILE
- echo "SHELLINABOX_PARAM=" >> $CONFIGFILE
+ echo "SHELLINABOX_PARAMS=" >> $CONFIGFILE
echo >> $CONFIGFILE
echo "HELP_SHELLINABOX=\"Shellinabox is a daemon for webshells\"" >> $SOFTWAREHELP
fi
--- NEW FILE: libnetfilter_cttimeout ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/libnetfilter_cttimeout,v $
# $Revision: 1.1 $
# $Date: 2012/08/09 12:45:12 $
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
# get the directoryname of the script
MYDIR=${0%/*}
# source functions and config
source $MYDIR/settings
case $1 in
build )
./configure --prefix=/usr || exit 1
make $PMAKE all || exit 1
# install it in local system, because other programs could need it
make install
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
--- NEW FILE: libconfig ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/libconfig,v $
# $Revision: 1.1 $
# $Date: 2012/08/09 12:45:12 $
#
# http://www.devil-linux.org
# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3
# get the directoryname of the script
MYDIR=${0%/*}
# source functions and config
source $MYDIR/settings
case $1 in
build )
./configure --prefix=/usr --localstatedir=/var --disable-examples || exit 1
make $PMAKE all || exit 1
# install it in local system, because other programs could need it
make install
;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
exit 1
;;
esac
Index: create_cd_dirs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- create_cd_dirs 6 Mar 2012 16:46:40 -0000 1.40
+++ create_cd_dirs 9 Aug 2012 12:45:12 -0000 1.41
@@ -28,7 +28,7 @@
mk_dir $BOOTIMAGEDIR $DIRS
# the cd tree
- DIRS='boot lib/modules bin sbin usr/bin usr/sbin usr/lib usr/share usr/share/doc usr/share/man usr/share/info usr/share/devillinux shm opt dev tmp root etc mnt sys'
+ DIRS='boot lib/modules bin sbin usr/bin usr/sbin usr/lib usr/share usr/share/doc usr/share/man usr/share/info usr/share/devillinux shm opt dev tmp root etc mnt sys jail'
mk_dir $CDDIR $DIRS
mkdir -p $CDDIR/usr/share/man/man{1,2,3,4,5,6,7,8,9}
@@ -69,7 +69,6 @@
# create links
ln -sf /var/tmp $CDDIR/usr/tmp
- ln -sf /shm/jail $CDDIR/jail
ln -sf /var/spool $CDDIR/usr/spool
ln -sf /var/run $CDDIR/run
Index: iproute2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- iproute2 8 Mar 2012 14:18:57 -0000 1.37
+++ iproute2 9 Aug 2012 12:45:12 -0000 1.38
@@ -47,9 +47,6 @@
cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
rm -rf $TMPDIR/etc || exit 1
- cp -dpR $TMPDIR/share $CDDIR/usr/ || exit 1
- rm -rf $TMPDIR/share || exit 1
-
cp -dpR $TMPDIR/* $CDDIR/ || exit 1
rm -rf $TMPDIR || exit 1
;;
|
