[arch-commits] Commit in openstack-guest-agents-unix/trunk (2 files)

[Daniel Wallace]

    Date: Wednesday, February 18, 2015 @ 16:11:26
  Author: dwallace
Revision: 127926

upgpkg: openstack-guest-agents-unix 1:1.39.1-1

upgpkg: openstack-guest-agents-unix 1.39.1

Added:
  openstack-guest-agents-unix/trunk/default-source.patch
Modified:
  openstack-guest-agents-unix/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 ++++++------
 default-source.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-18 14:59:10 UTC (rev 127925)
+++ PKGBUILD	2015-02-18 15:11:26 UTC (rev 127926)
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 pkgname=openstack-guest-agents-unix
-pkgver=1.39.0
+pkgver=1.39.1
 epoch=1
-pkgrel=3
+pkgrel=1
 pkgdesc="This is the Unix Guest Agent for Openstack"
 arch=('i686' 'x86_64')
 url="https://github.com/rackerlabs/openstack-guest-agents-unix"
@@ -10,14 +10,14 @@
 depends=('python2-simplejson' 'python2-crypto' 'patchelf' 'python2-xenstore')
 makedepends=('git')
 options=(!emptydirs)
-source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=v$pkgver")
-md5sums=('SKIP')
+source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=$pkgver" 'default-source.patch')
+md5sums=('SKIP'
+         'b23830e3ea12db0b5e9568df02629e7e')
 
 prepare(){
   cd "$srcdir/$pkgname"
+  git apply $srcdir/default-source.patch
   find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
-  git cherry-pick -n 387d4e77695598a07be9e4593c5b236b81a1aeea
-  git cherry-pick -n f9a365e7a9543d407ca9d75164688faa0ff53528
 }
 
 build() {

Added: default-source.patch
===================================================================
--- default-source.patch	                        (rev 0)
+++ default-source.patch	2015-02-18 15:11:26 UTC (rev 127926)
@@ -0,0 +1,13 @@
+diff --git a/lib/agentlib.c b/lib/agentlib.c
+index cced430..9398ca1 100644
+--- a/lib/agentlib.c
++++ b/lib/agentlib.c
+@@ -17,7 +17,7 @@
+  *    under the License.
+  */
+ 
+-#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>