Merge commit 'ms/minicom'

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 5a0ce0d2ddaca663a309b2f072941fdd4003f0ef..f38ed4e2af6559111fe2f45a7fd94ea65788af64 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.5.i586-full-core37.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
new file mode 100644 (file)
index 0000000..29f1177
--- /dev/null
+++ b/config/rootfiles/packages/openvmtools
@@ -0,0 +1,39 @@
+etc/rc.d/init.d/openvmtools
+etc/rc.d/rc0.d/K01openvmtools
+etc/rc.d/rc3.d/S60openvmtools
+etc/rc.d/rc6.d/K01openvmtools
+etc/vmware-tools
+etc/vmware-tools/plugins
+etc/vmware-tools/poweroff-vm-default
+etc/vmware-tools/poweron-vm-default
+etc/vmware-tools/resume-vm-default
+etc/vmware-tools/suspend-vm-default
+etc/vmware-tools/vm-support
+sbin/mount.vmhgfs
+usr/bin/vmtoolsd
+usr/bin/vmware-checkvm
+usr/bin/vmware-hgfsclient
+usr/bin/vmware-rpctool
+usr/bin/vmware-toolbox-cmd
+usr/bin/vmware-vmblock-fuse
+usr/bin/vmware-xferlogs
+usr/lib/libguestlib.a
+usr/lib/libguestlib.la
+usr/lib/libguestlib.so
+usr/lib/libguestlib.so.0
+usr/lib/libguestlib.so.0.0.0
+usr/lib/libvmtools.a
+usr/lib/libvmtools.la
+usr/lib/libvmtools.so
+usr/lib/libvmtools.so.0
+usr/lib/libvmtools.so.0.0.0
+usr/lib/open-vm-tools
+usr/lib/open-vm-tools/plugins
+usr/lib/open-vm-tools/plugins/vmsvc
+usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+usr/lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so
+usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvix.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+usr/sbin/mount.vmhgfs

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index acde82953eb042a1f9f2c008043e69b6ef08281b..ee4aa7305bbb62ca829fc6b516cbf767b4570a76 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -185,6 +185,7 @@
 * liboping-1.3.4
 * libpcap-1.0.0
 * libpng-1.2.12
+* libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16
 * libshout-2.2.2
@@ -256,7 +257,7 @@
 * nut-2.4.3
 * ocaml-3.09.2
 * oinkmaster-2.0
-* open-vm-tools-2009.05.22-167859
+* open-vm-tools-8.4.2-261024
 * openldap-2.3.20
 * openmailadmin-1.0.0
 * openssh-5.4p1
@@ -333,6 +334,7 @@
 * texinfo-4.8
 * tftp-hpa-0.48
 * tiff-3.8.2
+* tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2
 * tunctl

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 8c7584849299d74607a474817f188216ee863768..44777628031e473db3459acfb3e6a1f1fef06bac 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.5.i586-full-core37.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core38.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2f984c777a487f5f7642f3abbe6aee31
+$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863
 
 install : $(TARGET)
 

diff --git a/lfs/open-vm-tools b/lfs/openvmtools
similarity index 89%
rename from lfs/open-vm-tools
rename to lfs/openvmtools
index 214193ab20d9d39c380287f2629bb9a3f3998da9..c708268f0795d4fe38a43a0ac5597e422f979d89 100644 (file)
--- a/lfs/open-vm-tools
+++ b/lfs/openvmtools
@@ -24,13 +24,16 @@
 
 include Config
 
-VER        = 2009.05.22-167859
+VER        = 8.4.2-261024
 
 THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = openvmtools
+PAK_VER    = 0
+DEPS       = "glib"
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c
+$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486
 
 install : $(TARGET)
 
@@ -50,6 +53,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+       @$(PAK) 
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,5 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --without-kernel-modules
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
+       rm -rvf /usr/etc/pam.d /usr/share/openvmtools
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 5702de8c016e49fb9c9759d4b36510c99d142845..c0169a30f6fe0d6fee95f9f9f393195a79fab1c7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -625,7 +625,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion

diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools
new file mode 100755 (executable)
index 0000000..c1588e1
--- /dev/null
+++ b/src/initscripts/init.d/openvmtools
@@ -0,0 +1,64 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/
+#
+# Description : init-script for open-vm-tools
+#
+# Authors     : earl
+#
+# Version     : 00.01
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+       if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+               then
+               boot_mesg "vmtoolsd is running..."
+               echo_warning
+       else
+               if /usr/bin/vmware-checkvm > /dev/null 2>&1; then
+                       boot_mesg "Starting..."
+                       /usr/bin/vmtoolsd &
+                       echo_ok
+               else
+                       boot_mesg "IPFire is not running in a virtual machine." 
+                       echo_failure
+               fi
+       fi
+       ;;
+       
+       stop)
+       if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+               then
+               boot_mesg "Stopping..."
+               killall  /usr/bin/vmtoolsd > /dev/null
+               echo_ok
+       else
+               boot_mesg "vmtoolsd is not running..."  
+               echo_warning
+       fi
+       ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /usr/bin/vmtoolsd
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/