[arch-commits] Commit in open-vm-tools/trunk (PKGBUILD scripts-network-FS19541.patch)

[Sergej Pupykin]

    Date: Sunday, May 5, 2013 @ 23:44:13
  Author: spupykin
Revision: 89944

upgpkg: open-vm-tools 1:9.2.3-1

upd

Modified:
  open-vm-tools/trunk/PKGBUILD
  open-vm-tools/trunk/scripts-network-FS19541.patch

-------------------------------+
 PKGBUILD                      |   11 ++++++-----
 scripts-network-FS19541.patch |   22 +++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-05 21:39:24 UTC (rev 89943)
+++ PKGBUILD	2013-05-05 21:44:13 UTC (rev 89944)
@@ -5,9 +5,9 @@
 pkgbase=open-vm-tools
 pkgname=('open-vm-tools' 'open-vm-tools-dkms')
 epoch=1
-pkgver=9.2.2
-_pkgsubver=893683
-pkgrel=7
+pkgver=9.2.3
+_pkgsubver=1031360
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -32,9 +32,9 @@
 	xautostart.conf
 	modprobe.conf
 	vmtoolsd.service)
-md5sums=('7af505681d736d4c9ee6493b1166689f'
+md5sums=('71a1d8065b632692af2cdcc9d82f305e'
          'b8f68fef3d388489e40dba581b6da18a'
-         '507ead54854e49762ca2a6893529c484'
+         '921637fcb05cd68b1c8350fcb7d59d36'
          '8c333a979578bdc0c3134c1dd6bb7353'
          '6567ca1b465854f832fc94a4e9faf876'
          '0848618fa6310294db2752c77ae99865'
@@ -47,6 +47,7 @@
 build() {
   cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
   export CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS ${CFLAGS}"
+  sed -i 's|-Werror||g' configure{,.ac}
   [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules
   make
 }

Modified: scripts-network-FS19541.patch
===================================================================
--- scripts-network-FS19541.patch	2013-05-05 21:39:24 UTC (rev 89943)
+++ scripts-network-FS19541.patch	2013-05-05 21:44:13 UTC (rev 89944)
@@ -1,6 +1,6 @@
---- network.orig	2011-11-09 18:42:28.000000000 +0400
-+++ network	2011-11-09 18:46:22.000000000 +0400
-@@ -76,7 +76,7 @@
+--- network.orig	2013-05-06 01:26:27.000000000 +0400
++++ network	2013-05-06 01:31:28.718026417 +0400
+@@ -89,7 +89,7 @@
           else
              echo `date` "[rescue_nic] activating $nic ..."
  
@@ -9,16 +9,16 @@
              exitCode=`expr $exitCode \| $?`
           fi
        done < $activeList
-@@ -105,7 +105,7 @@
+@@ -118,7 +118,7 @@
     # `which' may be a bit noisy, so we'll shush it.
     dbusSend=`which dbus-send 2>/dev/null`
     rc=$?
--   if [ $rc = 0 ]; then
-+   if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then
-       # NetworkManager 0.8.0
-       $dbusSend --system --print-reply          \
-          --dest=org.freedesktop.NetworkManager  \
-@@ -154,7 +154,7 @@
+-   if [ $rc -ne 0 ]; then
++   if [ $rc -ne 0 ] || [ -z `pidof dbus-daemon` ]; then
+       return $rc
+    fi
+ 
+@@ -191,7 +191,7 @@
     # `which' may be a bit noisy, so we'll shush it.
     dbusSend=`which dbus-send 2>/dev/null`
     rc=$?
@@ -27,7 +27,7 @@
        # NetworkManager 0.8.0
        $dbusSend --system --print-reply          \
           --dest=org.freedesktop.NetworkManager  \
-@@ -203,7 +203,7 @@
+@@ -237,7 +237,7 @@
  
     # XXX Are these really necessary?  If so, we should have seen customer
     # complaints by now.