[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 608f644801bdf68b3de76142c51ff6dd85e9a911 - IPFire-SCM

2 Jul 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  608f644801bdf68b3de76142c51ff6dd85e9a911 (commit)
       via  6d4a602f10a4abf0b97e9495d7f83ecc86146da8 (commit)
       via  a075b9c5b1ed774a28a27e4ce41fc21ee683ae0d (commit)
       via  aac6b746ce329ab2ad521cb62455dadfdda96665 (commit)
      from  18b98cafca11b61b8c462360ef36bb22674100bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 608f644801bdf68b3de76142c51ff6dd85e9a911
Merge: 18b98cafca11b61b8c462360ef36bb22674100bd 6d4a602f10a4abf0b97e9495d7f83ecc86146da8
Author: root root@ipfire-build.rechtsabteilung
Date:   Fri Jul 2 22:00:02 2010 +0200
Merge branch 'open-vm-tools'
commit 6d4a602f10a4abf0b97e9495d7f83ecc86146da8
Author: root root@ipfire-build.rechtsabteilung
Date:   Fri Jul 2 21:52:44 2010 +0200
Added open-vm-tools package
commit a075b9c5b1ed774a28a27e4ce41fc21ee683ae0d
Author: root root@ipfire-build.rechtsabteilung
Date:   Fri Jul 2 21:49:49 2010 +0200
Changed make.sh to prepare open-vm-tools package
commit aac6b746ce329ab2ad521cb62455dadfdda96665
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Jun 27 11:32:28 2010 +0200
Update open-vm-tools.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/openvmtools |   39 ++++++++++++++++++++
 doc/packages-list.txt                 |    2 +-
 lfs/{open-vm-tools => openvmtools}    |   14 ++++++-
 make.sh                               |    2 +-
 src/initscripts/init.d/openvmtools    |   64 +++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 config/rootfiles/packages/openvmtools
 rename lfs/{open-vm-tools => openvmtools} (90%)
 create mode 100755 src/initscripts/init.d/openvmtools
Difference in files:

diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
new file mode 100644
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 91599d0..ee4aa73 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -257,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
diff --git a/lfs/open-vm-tools b/lfs/open-vm-tools
deleted file mode 100644
index 214193a..0000000
--- a/lfs/open-vm-tools
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2009.05.22-167859
-
-THISAPP    = open-vm-tools-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-	   --with-kernel-release=$(KVER)-ipfire --without-pam \
-	   --disable-unity --without-gtk2 --without-gtkmm \
-	   --without-procps --without-dnet --without-icu \
-	   --without-x --with-linuxdir=/usr/src/linux \
-	   --without-kernel-modules
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/openvmtools b/lfs/openvmtools
new file mode 100644
index 0000000..c708268
--- /dev/null
+++ b/lfs/openvmtools
@@ -0,0 +1,92 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+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
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+	@$(PAK) 
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+	   --with-kernel-release=$(KVER)-ipfire --without-pam \
+	   --disable-unity --without-gtk2 --without-gtkmm \
+	   --without-procps --without-dnet --without-icu \
+	   --without-x --with-linuxdir=/usr/src/linux \
+	   --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 eb63bb4..574f9f2 100755
--- 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
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/
hooks/post-receive
--
IPFire 2.x development tree

    