Menu
▾
▴
[Devil-linux-commit] build/scripts curl, 1.1.2.2, 1.1.2.3 linux, 1.54.2.3, 1.54.2.4 net-snmp, 1.4.2.6, 1.4.2.7 open-vm-tools, 1.1.2.3, 1.1.2.4 procps, 1.10.2.1, 1.10.2.2 shorewall-common, 1.1.2.1, 1.1.2.2 shorewall, 1.6.2.1, NONE
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv674/scripts Modified Files: Tag: rel-1-2-patches curl linux net-snmp open-vm-tools procps shorewall-common Removed Files: Tag: rel-1-2-patches shorewall Log Message: - updated ImageMagick-6.4.1-8 - updated Mail-SpamAssassin-3.2.5 - updated clamav-0.93.1 - updated curl-7.18.2 - updated dnsmasq-2.42 - updated freetype-2.3.6 - updated httpd-2.2.9 - updated l7-protocols-2008-04-23 - updated lftp-3.7.3 - updated memtest86-3.4 - updated mysql-5.0.51b - updated ntop-3.3.6 - updated openldap-2.4.10 - updated openssl-0.9.8h - updated postfix-2.5.2 - updated postgresql-8.3.3 - updated pptp-1.7.2 - updated stunnel-4.25 - updated sysstat-8.1.3 - updated wget-1.11.3 Index: open-vm-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- open-vm-tools 22 Feb 2008 15:22:18 -0000 1.1.2.3 +++ open-vm-tools 16 Jun 2008 14:58:13 -0000 1.1.2.4 @@ -27,7 +27,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 || exit 1 + CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --without-x --without-icu || exit 1 make all modules || exit 1 fi ;; Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -d -r1.4.2.6 -r1.4.2.7 --- net-snmp 21 Mar 2008 20:01:05 -0000 1.4.2.6 +++ net-snmp 16 Jun 2008 14:58:13 -0000 1.4.2.7 @@ -29,10 +29,10 @@ build ) if [ "$CONFIG_NET_SNMP" = "y" ]; then # HOT-FIX - if [ ! -e .net-snmp.ntop.patch ]; then - bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1 - touch .net-snmp.ntop.patch - fi + #if [ ! -e .net-snmp.ntop.patch ]; then + # bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1 + # touch .net-snmp.ntop.patch + #fi ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1 # disable parallel builds make all || exit 1 Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.54.2.3 retrieving revision 1.54.2.4 diff -u -d -r1.54.2.3 -r1.54.2.4 --- linux 15 Dec 2007 16:11:33 -0000 1.54.2.3 +++ linux 16 Jun 2008 14:58:13 -0000 1.54.2.4 @@ -41,6 +41,11 @@ make dep || exit 1 make $PMAKE bzImage || exit 1 make $PMAKE modules || exit 1 + + # make sure everything exists to make other scripts happy + make install || exit 1 + make modules_install || exit 1 + ;; install ) Index: curl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/curl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- curl 19 Aug 2007 14:02:50 -0000 1.1.2.2 +++ curl 16 Jun 2008 14:58:12 -0000 1.1.2.3 @@ -48,9 +48,7 @@ make install DESTDIR=$TMPDIR || exit 1 - mkdir -p $ETCDIR/etc || exit 1 - cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 - rm -rf $TMPDIR/etc || exit 1 + mkdir -p $ETCDIR/etc/curl || exit 1 rm -rf $TMPDIR/usr/include || exit 1 cp -dpR $TMPDIR/* $CDDIR || exit 1 Index: shorewall-common =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shorewall-common,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- shorewall-common 28 Aug 2007 13:38:30 -0000 1.1.2.1 +++ shorewall-common 16 Jun 2008 14:58:13 -0000 1.1.2.2 @@ -49,12 +49,18 @@ mv $CDDIR/usr/share/shorewall/modules $ETCDIR/etc/shorewall/ || exit 1 ln -sf /etc/shorewall/modules $CDDIR/usr/share/shorewall/modules || exit 1 + # Copy the shorewall documentation onto the cd + # never versions don't seem to have the documentation included anymore + # but we leave the lines in here, just in case they change their mind again + #mkdir -p $MY_DOCDIR + #cp -pr documentation/* $MY_DOCDIR || exit 1 + # Copy our own startup script into /etc/init.d cp $MYDIR/scripts/shorewall $ETCDIR/etc/init.d/ rm -rf $TMPDIR || exit 1 # Create the shorewall option in the config file - echo "# Start $MYNAME?" >> $CONFIGFILE + echo "# Start Shorewall?" >> $CONFIGFILE echo "START_SHOREWALL=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_SHOREWALL=\"SHOREWALL is an alternate firewall creation script (www.shorewall.net)\"" >> $SOFTWAREHELP Index: procps =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/procps,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -d -r1.10.2.1 -r1.10.2.2 --- procps 21 Feb 2008 20:34:37 -0000 1.10.2.1 +++ procps 16 Jun 2008 14:58:13 -0000 1.10.2.2 @@ -27,6 +27,11 @@ build ) make $PMAKE || exit 1 strip_debug + + # let's install this so we can use it later + make install || exit 1 + mkdir -p /usr/include/proc || exit 1 + cp -dpv proc/*.h /usr/include/proc || exit 1 ;; install ) --- shorewall DELETED --- |
