From cb5f0aa9734b1fe683abd3195a5682c6cc41e7e4 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 24 Apr 2015 12:07:57 +0200
Subject: main/patchwork: remove bashism and change path for tools

---
 ...needed-bashism-from-tools-and-change-path.patch | 42 ++++++++++++++++++++++
 main/patchwork/APKBUILD                            | 14 +++++---
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch

diff --git a/main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch b/main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch
new file mode 100644
index 0000000000..231e420ee2
--- /dev/null
+++ b/main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch
@@ -0,0 +1,42 @@
+From b688b62e30525c797fff7453e1ca3ba2251e3756 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Fri, 24 Apr 2015 12:03:26 +0200
+Subject: [PATCH] remove uneeded bashism from tools and change path
+
+---
+ tools/patchwork-update-commits | 2 +-
+ tools/post-receive.hook        | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/patchwork-update-commits b/tools/patchwork-update-commits
+index b2a658a..39670eb 100755
+--- a/tools/patchwork-update-commits
++++ b/tools/patchwork-update-commits
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ toolsdir="$(dirname "$0")"
+ pwpath="${toolsdir}"/../apps/patchwork
+diff --git a/tools/post-receive.hook b/tools/post-receive.hook
+index a38522e..7b567a4 100755
+--- a/tools/post-receive.hook
++++ b/tools/post-receive.hook
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Git post-receive hook to update Patchwork patches after Git pushes
+ #
+@@ -15,7 +15,7 @@ STATE_MAP="refs/heads/master:Accepted"
+ #
+ EXCLUDE=""
+ 
+-PWDIR=/srv/patchwork/apps/patchwork
++PWDIR=/usr/share/webapps/patchwork/apps/patchwork
+ 
+ do_exit=0
+ trap "do_exit=1" INT
+-- 
+2.3.5
+
diff --git a/main/patchwork/APKBUILD b/main/patchwork/APKBUILD
index 7a1eb129cb..2575712383 100644
--- a/main/patchwork/APKBUILD
+++ b/main/patchwork/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=patchwork
 pkgver=0_git20150420
-pkgrel=5
+pkgrel=6
 pkgdesc="Web-based patch tracking system "
 url="http://jk.ozlabs.org/projects/patchwork/"
 arch="noarch"
@@ -16,7 +16,8 @@ subpackages="$pkgname-doc $pkgname-apache2-wsgi:apache2_wsgi $pkgname-mysql
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
 	0001-support-busybox-readlink.patch
 	0001-use-webapps-dir-structure.patch
-	0001-pwclient-set-default-url-to-alpine-patchwork.patch"
+	0001-pwclient-set-default-url-to-alpine-patchwork.patch
+	0001-remove-uneeded-bashism-from-tools-and-change-path.patch"
 giturl="git://ozlabs.org/home/jk/git/patchwork"
 disturl="dev.alpinelinux.org:/archive/$pkgname/"
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -79,12 +80,15 @@ pwclient() {
 md5sums="d327c8ca2f219f597855afadaa520c1d  patchwork-0_git20150420.tar.gz
 597e39e9742fa8352b3d34f59f8d404e  0001-support-busybox-readlink.patch
 629ebd3fa8ed122b319a73161367c9c1  0001-use-webapps-dir-structure.patch
-82d64c7d30a19789798af8630b7b4da7  0001-pwclient-set-default-url-to-alpine-patchwork.patch"
+82d64c7d30a19789798af8630b7b4da7  0001-pwclient-set-default-url-to-alpine-patchwork.patch
+3b601b5cc3f21ec76011a292c38759f6  0001-remove-uneeded-bashism-from-tools-and-change-path.patch"
 sha256sums="769f6839f4e25321ecedaf8e7561e1a5e71e2fdb942c33aefb0798f651ed0914  patchwork-0_git20150420.tar.gz
 b87b6ab985e30e75d641d31cfae76420eb3dc5e90b7484f217dd92454e3495af  0001-support-busybox-readlink.patch
 6266599432e20b2c638023417346d94840e4fbaaedd1899895904315376ad50f  0001-use-webapps-dir-structure.patch
-dc188344123594add1a3140e8f02d8fc453b06dc0237110f11e7d43791b9a00d  0001-pwclient-set-default-url-to-alpine-patchwork.patch"
+dc188344123594add1a3140e8f02d8fc453b06dc0237110f11e7d43791b9a00d  0001-pwclient-set-default-url-to-alpine-patchwork.patch
+179c7fc763d9fa6dd684be4f4c056441d27c23a7ab0262416b0ba1732ab579f4  0001-remove-uneeded-bashism-from-tools-and-change-path.patch"
 sha512sums="5e0f93afa3d9afbb97a7e44e355f0f6fae87e77ea8a7d960637984f8f33751a0acd937efc583e6ec6405ca3ff7eb86d100b8ae66e565961afac572fd72587a25  patchwork-0_git20150420.tar.gz
 09fc0d88ce766bce53a0789276e6ad3e52049771e3945ae6a9e6b61cc706f5a44d398de5ae23055b2d205fd3844b84fca538617142e194c5ca149263b9afa0bb  0001-support-busybox-readlink.patch
 429df7faef59701d3754b001a0834fe4a91c13f20a2f50d407d21b145f167ce241fea046e8c251b1993c2e8b7e0aeb29bf69227446ca2236db0e5dd576f38477  0001-use-webapps-dir-structure.patch
-1a5007f28ca7f1ed98dfa7c43e4388d76833d6f80b102e30f850517d8ceb1c86277c0c9c048a8987ede20001bc208e2be8147d20ec9354216bd2e751c72ebc97  0001-pwclient-set-default-url-to-alpine-patchwork.patch"
+1a5007f28ca7f1ed98dfa7c43e4388d76833d6f80b102e30f850517d8ceb1c86277c0c9c048a8987ede20001bc208e2be8147d20ec9354216bd2e751c72ebc97  0001-pwclient-set-default-url-to-alpine-patchwork.patch
+5ecc911e60cf75f1885339785a8ce805114c722871069268af494cc24dc73d5d8af608a0f16c2ea15684f709770d031b5c02295f19fdf896599e1b50f0cf6e5b  0001-remove-uneeded-bashism-from-tools-and-change-path.patch"
-- 
cgit v1.2.3