Menu
▾
▴
[Devil-linux-commit] build/scripts aufs, 1.6, 1.7 compartment, 1.16, 1.17 dvd+rw-tools, 1.3, 1.4 grsecurity, 1.40, 1.41 iputils, 1.11, 1.12 lcd4linux, 1.5, 1.6 libcap, 1.2, 1.3 open-vm-tools, 1.7, 1.8 prepare, 1.79, 1.80 squashfs, 1.1, 1.2 linux-wlan-ng, 1.27, NONE
|
From: Heiko Z. <smi...@us...> - 2009-04-16 13:58:05
|
Update of /cvsroot/devil-linux/build/scripts In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv653/scripts Modified Files: aufs compartment dvd+rw-tools grsecurity iputils lcd4linux libcap open-vm-tools prepare squashfs Removed Files: linux-wlan-ng Log Message: 1.4RC1 - replaced vmware-guestd with vmtoolsd - disabled DST for now (no kernel patch for 2.6.29) - removed linux-wlan-ng - updated aufs2-git-20090413 - updated awstats-6.9 - updated bridge-utils-git-20090408 - updated clamav-0.95.1 - updated curl-7.19.4 - updated dcc-1.3.103 - updated dvd+rw-tools-7.1 - updated fetchmail-6.3.9 - updated freetype-2.3.9 - updated gpm-1.20.6 - updated gradm-2.1.14-200903281538 - updated grsecurity-2.1.14-2.6.29-200903281534 - updated hdparm-9.14 - updated iptables-1.4.3 - updated iscsitarget-svn-20090413 - updated joe-3.7 - updated kid-0.9.6 - updated lftp-3.7.11 - updated libHX-2.5 - updated libcap-2.16 - updated libpng-1.2.35 - updated linux-2.6.29.1 - updated loop-AES-v3.2f - updated mc-4.6.2 - updated mtools-4.0.10 - updated nut-2.4.1 - updated open-vm-tools-2009.03.18-154848 - updated pciutils-3.0.3 - updated readline-5.2 - updated rrdtool-1.2.30 - updated sagator-1.1.1 - updated samba-3.3.3 - updated shorewall-common-4.2.6 - updated shorewall-perl-4.2.6 - updated shorewall-shell-4.2.6 - updated snort-2.8.4 - updated swig-1.3.39 - updated syslinux-3.73 - updated sysstat-9.0.1 - updated tar-1.22 - updated tftp-hpa-5.0 - updated util-linux-ng-2.14.2 - updated zip-1.8.10 Index: open-vm-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- open-vm-tools 27 Oct 2008 14:38:16 -0000 1.7 +++ open-vm-tools 16 Apr 2009 13:57:58 -0000 1.8 @@ -26,7 +26,7 @@ case $1 in build ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --without-x \ + CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --sysconfdir=/etc --without-x \ --without-icu --with-kernel-release=${KERNELVERSION} || exit 1 make all modules || exit 1 fi @@ -34,25 +34,13 @@ install ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - cp -dpvR libguestlib/.libs/libguestlib.so* $CDDIR/usr/lib/ || exit 1 - - # copy all the binaries and put a vmware- in front of it - set -x - SBINS="guestd/vmware-guestd checkvm/vmware-checkvm hgfsclient/vmware-hgfsclient hgfsmounter/moung.vmhgfs xferlogs/vmware-xferlogs" - for SBIN in ${SBINS} ; - do - #cp -dpv $SBIN $CDDIR/usr/sbin/vmware-${SBIN##*/} - cp -dpv $SBIN $CDDIR/usr/sbin/${SBIN##*/} - done - - # now lets catch all the modules - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 - cp -dpv $(find modules/ -name \*.ko) $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$TMPDIR || exit 1 - mkdir -p $ETCDIR/etc/vmware-tools || exit 1 - find scripts/linux/ -maxdepth 1 -type f -exec cp -dpv '{}' $ETCDIR/etc/vmware-tools/ \; - cp -dpv scripts/linux/pam.d/* $ETCDIR/etc/pam.d/ || exit 1 - chmod 775 $ETCDIR/etc/vmware-tools/* || exit 1 + cp -dpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d/ || exit 1 Index: aufs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/aufs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- aufs 7 Jan 2009 06:03:00 -0000 1.6 +++ aufs 16 Apr 2009 13:57:58 -0000 1.7 @@ -27,18 +27,27 @@ case $1 in build ) if [ "$CONFIG_ETCFS" = "AUFS" ]; then - make CONFIG_AUFS_FAKE_DM= CONFIG_AUFS_SYSAUFS= CONFIG_AUFS_STAT=y CONFIG_AUFS_MAGIC_SYSRQ= KDIR=$KERNELDIR SUBLEVEL=25 -f local.mk || exit 1 + #cd aufs2-standalone || exit 1 + #replace_str config.mk "CONFIG_AUFS_DEBUG = y" "CONFIG_AUFS_DEBUG = " + #make KDIR=$KERNELDIR || exit 1 + #cp -dpvR include/* /usr/include/ || exit 1 + #cd ../aufs2-util || exit 1 + cd aufs2-util || exit 1 + make KDIR=$KERNELDIR all || exit 1 fi ;; install ) if [ "$CONFIG_ETCFS" = "AUFS" ]; then - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1 - perl -p -i.bak -e 's#/etc/default/aufs\b#/etc-cd/default/aufs#g' util/* - cp -v util/etc_default_aufs $ETCDIR/etc/default/aufs || exit 1 - cp -v fs/aufs25/aufs.ko $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1 - cp -v util/aufind.sh util/aulchown util/auplink util/mount.aufs util/umount.aufs $CDDIR/sbin/ || exit 1 - cp -v util/aufs.5 $CDDIR/usr/share/man/man5/ || exit 1 + cp -dpvR aufs2-standalone/Documentation/filesystems/aufs/aufs.5 $CDDIR/usr/share/man/man5/ || exit 1 + cd aufs2-util || exit 1 + mkdir -p $TMPDIR/{sbin,usr/bin} || exit 1 + mkdir -p $TMPDIR/etc/default || exit 1 + make KDIR=$KERNELDIR DESTDIR=$TMPDIR install || exit 1 + cp -dpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 fi ;; Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- prepare 9 Feb 2009 19:56:57 -0000 1.79 +++ prepare 16 Apr 2009 13:57:58 -0000 1.80 @@ -59,6 +59,10 @@ ln -sf $KERNELDIR /usr/src/linux || exit 1 make -C $KERNELDIR headers_check || exit 1 + mkdir -p $TMPDIR + make -C $KERNELDIR INSTALL_HDR_PATH=$TMPDIR headers_install || exit 1 + cp -vpr $TMPDIR/include/* /usr/include/ || exit 1 + rm -rf $TMPDIR ;; @@ -96,17 +100,16 @@ if [ "$CONFIG_ETCFS" = "UnionFS" ]; then cat $KERNEL_CONFIG_DIR/config_linux.unionfs >> $KERNELDIR/.config || exit 1 - fi - - pushd $KERNELDIR > /dev/null - - if [ "$CONFIG_ETCFS" = "UnionFS" ]; then + pushd $KERNELDIR > /dev/null + echo "Patching UnionFS" if [ ! -f devil-linux-unionfs-kernel-patches.done ]; then touch devil-linux-unionfs-kernel-patches.done zcat $SRCDIR/unionfs-*_for_2.6.*.diff.gz | patch -p1 || exit 1 fi + popd > /dev/null fi + cd $KERNELDIR if [ ! -f devil-linux-kernel-patches.done ]; then touch devil-linux-kernel-patches.done for PATCH in $(ls $WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION/* 2> /dev/null ) @@ -143,11 +146,22 @@ fi if [ "$CONFIG_ETCFS" = "AUFS" ]; then + echo "Patching AUFS" if [ ! -f $KERNELDIR/.done_aufs_patch ]; then - AUFSDIR=$(find_src_dir aufs) - patch -d $KERNELDIR -p1 -i ${AUFSDIR}/patch/sec_perm-2.6.24.patch || exit 1 + AUFSDIR=$(find_src_dir aufs2) + patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-standalone.patch || exit 1 + cp -dpvR ${AUFSDIR}/aufs2-standalone/{fs,Documentation,include} $KERNELDIR/ || exit 1 touch $KERNELDIR/.done_aufs_patch fi + set_kernel_option CONFIG_AUFS_FS m + set_kernel_option CONFIG_AUFS_HINOTIFY n + set_kernel_option CONFIG_AUFS_DEBUG n + set_kernel_option CONFIG_AUFS_BRANCH_MAX_127 y + set_kernel_option CONFIG_AUFS_BRANCH_MAX_511 n + set_kernel_option CONFIG_AUFS_BRANCH_MAX_1023 n + set_kernel_option CONFIG_AUFS_BRANCH_MAX_32767 n + set_kernel_option CONFIG_AUFS_EXPORT n + set_kernel_option CONFIG_AUFS_BR_RAMFS n fi # make sure all netfilter modules are enabled @@ -163,9 +177,6 @@ make oldconfig || exit 1 # ( yes "" | make oldconfig ) || exit 1 - - popd > /dev/null - # make sure we have all needed and clean directories # one for the DL Kernel and one for the build system Kernel rm -rf /lib/modules Index: iputils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iputils,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- iputils 18 Mar 2009 00:44:20 -0000 1.11 +++ iputils 16 Apr 2009 13:57:58 -0000 1.12 @@ -25,6 +25,11 @@ case $1 in build ) + if [ ! -f dl_patch_done ]; then + bzcat $DL_DIR/src/iputils-20070202-open-max.patch.bz2 | patch -p1 || exit 1 + touch dl_patch_done + fi + make $PMAKE || exit 1 strip_debug ;; Index: squashfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squashfs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- squashfs 14 Jan 2009 19:03:09 -0000 1.1 +++ squashfs 16 Apr 2009 13:57:58 -0000 1.2 @@ -30,13 +30,7 @@ bzcat $SRCDIR/squashfs3.4-dl.patch.bz2 | patch -p0 || exit 1 touch .dl.patch.done fi - # patch kernel - SQUASHFS_DIR=`pwd` - pushd $KERNELDIR > /dev/null - patch -p1 < $SQUASHFS_DIR/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch || exit 1 - echo -e "CONFIG_SQUASHFS=y\n# CONFIG_SQUASHFS_EMBEDDED is not set\nCONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3\n" >> .config || exit 1 - popd > /dev/null - + # Build userspace make -C squashfs-tools/ all || exit 1 strip_debug --- linux-wlan-ng DELETED --- Index: grsecurity =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- grsecurity 6 Feb 2009 13:05:05 -0000 1.40 +++ grsecurity 16 Apr 2009 13:57:58 -0000 1.41 @@ -43,6 +43,7 @@ set_kernel_option CONFIG_SECURITY_NETWORK y set_kernel_option CONFIG_SECURITY_NETWORK_XFRM y set_kernel_option CONFIG_SECURITY_ROOTPLUG n + set_kernel_option CONFIG_SECURITY_PATH y set_kernel_option CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR 0 set_kernel_option CONFIG_NETLABEL n set_kernel_option CONFIG_IP_NF_SECURITY m Index: dvd+rw-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dvd+rw-tools,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dvd+rw-tools 20 Jul 2005 18:30:24 -0000 1.3 +++ dvd+rw-tools 16 Apr 2009 13:57:58 -0000 1.4 @@ -27,6 +27,11 @@ build ) if [ "$CONFIG_DVDRWTOOLS" = "y" ]; then + if [ ! -f dl_patch_done ]; then + bzcat $DL_DIR/src/dvd+rw-tools-7.1-limits.patch.bz2 | patch -p1 || exit 1 + touch dl_patch_done + fi + make all || exit 1 make rpl8 || exit 1 fi Index: lcd4linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lcd4linux,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- lcd4linux 12 Dec 2004 21:48:08 -0000 1.5 +++ lcd4linux 16 Apr 2009 13:57:58 -0000 1.6 @@ -27,6 +27,7 @@ case $1 in build ) if [ "$CONFIG_LCD4LINUX" = "y" ]; then + replace_str configure.in "AC_CHECK_HEADERS(asm/msr.h)" "" ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/lcd4linux --with-drivers=all,!X11 || exit 1 make $PMAKE all || exit 1 strip_debug Index: libcap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libcap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libcap 28 Mar 2007 14:34:34 -0000 1.2 +++ libcap 16 Apr 2009 13:57:58 -0000 1.3 @@ -21,7 +21,7 @@ case $1 in build ) if [ ! -f .dl-patches.done ]; then - bzcat $SRCDIR/libcap-1.10.patch.bz2 | patch -p1 || exit 1 + bzcat $SRCDIR/libcap-2.16-headerfix.patch.bz2 | patch -p1 || exit 1 touch .dl-patches.done fi make || exit 1 Index: compartment =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/compartment,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- compartment 20 Mar 2007 02:41:45 -0000 1.16 +++ compartment 16 Apr 2009 13:57:58 -0000 1.17 @@ -32,6 +32,8 @@ bzcat $DL_DIR/src/compartment-no-close-fd.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-gcc33.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-gcc4.diff.bz2 | patch -p1 || exit 1 + bzcat $DL_DIR/src/compartment-type.diff.bz2 | patch -p1 || exit 1 + bzcat $DL_DIR/src/compartment-fs_mask.diff.bz2 | patch -p1 || exit 1 touch compartment_patch_done fi |
