Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26761/scripts
Modified Files:
curl grsecurity linux net-snmp open-vm-tools procps
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 dovecot-1.1.rc10
- updated freetype-2.3.6
- updated grsecurity-2.1.12-2.6.25.6-200806092111
- updated hdparm-8.8
- updated httpd-2.2.9
- updated l7-protocols-2008-04-23
- updated lftp-3.7.3
- updated lm_sensors-3.0.2
- updated mysql-5.0.51b
- updated nasm-2.03
- updated ndiswrapper-1.53
- updated ntop-3.3.6
- updated open-vm-tools-2008.06.03-96374
- updated openldap-2.4.10
- updated openssl-0.9.8h
- updated linux 2.6.25.6
- updated pax-linux-2.6.25.6-test23
- 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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- open-vm-tools 14 May 2008 11:46:51 -0000 1.5
+++ open-vm-tools 16 Jun 2008 17:41:54 -0000 1.6
@@ -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 --without-procps || 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
;;
@@ -37,10 +37,12 @@
cp -dpvR libguestlib/.libs/libguestlib.so* $CDDIR/usr/lib/ || exit 1
# copy all the binaries and put a vmware- in front of it
- SBINS="guestd/guestd checkvm/checkvm hgfsclient/hgfsclient hgfsmounter/hgfsmounter xferlogs/xferlogs"
+ 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/vmware-${SBIN##*/}
+ cp -dpv $SBIN $CDDIR/usr/sbin/${SBIN##*/}
done
# now lets catch all the modules
@@ -48,7 +50,8 @@
cp -dpv $(find modules/ -name \*.ko) $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
mkdir -p $ETCDIR/etc/vmware-tools || exit 1
- cp -dpv scripts/linux/* $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 $MYDIR/scripts/vmware $ETCDIR/etc/init.d/ || exit 1
Index: net-snmp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- net-snmp 3 Apr 2008 11:37:24 -0000 1.13
+++ net-snmp 16 Jun 2008 17:41:54 -0000 1.14
@@ -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 -j1 all || exit 1
Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- grsecurity 1 May 2008 20:14:33 -0000 1.35
+++ grsecurity 16 Jun 2008 17:41:54 -0000 1.36
@@ -46,6 +46,7 @@
# re-read the config to get the new kernel version
source $MYDIR/settings
+ echo new kernel version is $KERNELVERSION
mkdir -p /lib/modules/$KERNELVERSION
ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1
fi
Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- linux 15 Dec 2007 16:10:26 -0000 1.64
+++ linux 16 Jun 2008 17:41:54 -0000 1.65
@@ -42,6 +42,11 @@
make oldconfig
make CC="gcc -U_FORTIFY_SOURCE" $PMAKE bzImage || exit 1
make CC="gcc -U_FORTIFY_SOURCE" $PMAKE modules || exit 1
+
+ # make sure everything exists to make other scripts happy
+ make install || exit 1
+ make modules_install || exit 1
+
;;
Index: curl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/curl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- curl 22 Aug 2007 23:19:13 -0000 1.3
+++ curl 16 Jun 2008 17:41:54 -0000 1.4
@@ -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: procps
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/procps,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- procps 12 Dec 2004 21:48:09 -0000 1.11
+++ procps 16 Jun 2008 17:41:54 -0000 1.12
@@ -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 )
|
