main/patchwork: upgrade to 1.1.0

4 files changed, 33 insertions, 113 deletions

diff --git a/main/patchwork/0001-support-busybox-readlink.patch b/main/patchwork/0001-support-busybox-readlink.patch
index 9bc3f9dda0..8397b56b48 100644
--- a/main/patchwork/0001-support-busybox-readlink.patch
+++ b/main/patchwork/0001-support-busybox-readlink.patch
@@ -1,25 +1,13 @@
-From 44204d6be590cc7ad721be0b08d95c17355c0fda Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@gmail.com>
-Date: Wed, 22 Apr 2015 11:32:52 +0200
-Subject: [PATCH] support busybox readlink
-
----
- apps/patchwork/bin/parsemail.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apps/patchwork/bin/parsemail.sh b/apps/patchwork/bin/parsemail.sh
-index 246c2a1..53fb24c 100755
---- a/apps/patchwork/bin/parsemail.sh
-+++ b/apps/patchwork/bin/parsemail.sh
+diff --git a/patchwork/bin/parsemail.sh b/patchwork/bin/parsemail.sh
+index c8220a7..d363692 100755
+--- a/patchwork/bin/parsemail.sh
++++ b/patchwork/bin/parsemail.sh
 @@ -20,7 +20,7 @@
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  BIN_DIR=`dirname $0`
--PATCHWORK_BASE=`readlink -e $BIN_DIR/../../..`
-+PATCHWORK_BASE=`readlink -f $BIN_DIR/../../..`
+-PATCHWORK_BASE=`readlink -e $BIN_DIR/../..`
++PATCHWORK_BASE=`readlink -f $BIN_DIR/../..`
  
- PYTHONPATH="$PATCHWORK_BASE/apps":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \
-         DJANGO_SETTINGS_MODULE=settings \
--- 
-2.3.5
-
+ PYTHONPATH="$PATCHWORK_BASE":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \
+         DJANGO_SETTINGS_MODULE=patchwork.settings.production \
diff --git a/main/patchwork/0001-use-webapps-dir-structure.patch b/main/patchwork/0001-use-webapps-dir-structure.patch
deleted file mode 100644
index 723737f9de..0000000000
--- a/main/patchwork/0001-use-webapps-dir-structure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 19538be6d68f463ef3711054da4c68b32325e63b Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@gmail.com>
-Date: Wed, 22 Apr 2015 14:30:41 +0200
-Subject: [PATCH] use webapps dir structure
-
----
- lib/apache2/patchwork.wsgi.conf | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/lib/apache2/patchwork.wsgi.conf b/lib/apache2/patchwork.wsgi.conf
-index 3756e5a..0be4174 100644
---- a/lib/apache2/patchwork.wsgi.conf
-+++ b/lib/apache2/patchwork.wsgi.conf
-@@ -1,20 +1,20 @@
- <IfModule mod_alias.c>
--        Alias /images/ "/srv/patchwork/htdocs/images/"
--        Alias /css/ "/srv/patchwork/htdocs/css/"
--        Alias /js/ "/srv/patchwork/htdocs/js/"
--        Alias /robots.txt "/srv/patchwork/htdocs/robots.txt"
--        <Directory "/srv/patchwork/htdocs">
-+        Alias /images/ "/usr/share/webapps/patchwork/htdocs/images/"
-+        Alias /css/ "/usr/share/webapps/patchwork/htdocs/css/"
-+        Alias /js/ "/usr/share/webapps/patchwork/htdocs/js/"
-+        Alias /robots.txt "/usr/share/webapps/patchwork/htdocs/robots.txt"
-+        <Directory "/usr/share/webapps/patchwork/htdocs">
-                 Order allow,deny
-                 Allow from all
-         </Directory>
- 
--        Alias /media/ "/usr/share/python-support/python-django/django/contrib/admin/media/"
-+        Alias /static/admin/ "/usr/lib/python2.7/site-packages/django/contrib/admin/static/admin/"
- 
--        <Directory "/usr/share/python-support/python-django/django/contrib/admin/media/">
-+        <Directory "/usr/lib/python2.7/site-packages/django/contrib/admin/static/admin/">
-                 Order allow,deny
-                 Allow from all
-         </Directory>
- </IfModule>
- 
--WSGIScriptAlias / "/srv/patchwork/lib/apache2/patchwork.wsgi"
-+WSGIScriptAlias / "/usr/share/webapps/patchwork/lib/apache2/patchwork.wsgi"
- WSGIPassAuthorization On
--- 
-2.3.5
-
diff --git a/main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch b/main/patchwork/0002-remove-uneeded-bashism-from-tools-and-change-path.patch
index 231e420ee2..d668dde0bd 100644
--- a/main/patchwork/0001-remove-uneeded-bashism-from-tools-and-change-path.patch
+++ b/main/patchwork/0002-remove-uneeded-bashism-from-tools-and-change-path.patch
@@ -1,15 +1,5 @@
-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
+index 820fd1c..ca0022a 100755
 --- a/tools/patchwork-update-commits
 +++ b/tools/patchwork-update-commits
 @@ -1,4 +1,4 @@
@@ -17,9 +7,9 @@ index b2a658a..39670eb 100755
 +#!/bin/sh
  
  toolsdir="$(dirname "$0")"
- pwpath="${toolsdir}"/../apps/patchwork
+ pwpath="${toolsdir}"/../patchwork
 diff --git a/tools/post-receive.hook b/tools/post-receive.hook
-index a38522e..7b567a4 100755
+index 8f05b8d..3d6ec1b 100755
 --- a/tools/post-receive.hook
 +++ b/tools/post-receive.hook
 @@ -1,4 +1,4 @@
@@ -32,11 +22,8 @@ index a38522e..7b567a4 100755
  #
  EXCLUDE=""
  
--PWDIR=/srv/patchwork/apps/patchwork
-+PWDIR=/usr/share/webapps/patchwork/apps/patchwork
+-PWDIR=/srv/patchwork/patchwork
++PWDIR=/usr/share/webapps/patchwork/patchwork
  
  do_exit=0
  trap "do_exit=1" INT
--- 
-2.3.5
-
diff --git a/main/patchwork/APKBUILD b/main/patchwork/APKBUILD
index f67f40c1d1..919fd7ff77 100644
--- a/main/patchwork/APKBUILD
+++ b/main/patchwork/APKBUILD
@@ -1,27 +1,23 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=patchwork
-pkgver=0_git20150420
-pkgrel=7
+pkgver=1.1.0
+pkgrel=0
 pkgdesc="Web-based patch tracking system "
 url="http://jk.ozlabs.org/projects/patchwork/"
 arch="noarch"
 license="GPL"
-depends="py-django1.5 py-django-registration git"
+depends="py-django py-django-registration git py-psycopg2"
 depends_dev=""
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc $pkgname-apache2-wsgi:apache2_wsgi $pkgname-mysql
 	$pkgname-postgresql pwclient:pwclient"
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/getpatchwork/$pkgname/archive/v$pkgver.tar.gz
 	0001-support-busybox-readlink.patch
-	0001-use-webapps-dir-structure.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
+	0002-remove-uneeded-bashism-from-tools-and-change-path.patch"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
         local i
         cd "$_builddir"
@@ -43,11 +39,11 @@ package() {
 	install -Dm644 COPYING \
 		"$pkgdir"/usr/share/doc/$pkgname/COPYING || return 1
 	rm -f COPYING
-	install -Dm644 apps/settings.py \
-		"$pkgdir"/etc/$pkgname/local_settings.py || return 1
+	install -Dm644 patchwork/settings/production.example.py \
+		"$pkgdir"/etc/$pkgname/production.py || return 1
 	mv * "$pkgdir"/usr/share/webapps/$pkgname
-	cd "$pkgdir"/usr/share/webapps/patchwork/apps
-	ln -sf /etc/patchwork/local_settings.py || return 1
+	cd "$pkgdir"/usr/share/webapps/patchwork/patchwork/settings
+	ln -sf /etc/patchwork/production.py || return 1
 }
 
 apache2_wsgi() {
@@ -73,22 +69,16 @@ postgresql() {
 pwclient() {
 	pkgdesc="command-line client for patchwork"
 	depends="python"
-	install -Dm775 "$pkgdir"/usr/share/webapps/patchwork/apps/patchwork/bin/pwclient \
+	install -Dm775 "$pkgdir"/usr/share/webapps/patchwork/patchwork/bin/pwclient \
 		"$subpkgdir"/usr/bin/pwclient || return 1
 }
 
-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
-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
-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
-5ecc911e60cf75f1885339785a8ce805114c722871069268af494cc24dc73d5d8af608a0f16c2ea15684f709770d031b5c02295f19fdf896599e1b50f0cf6e5b  0001-remove-uneeded-bashism-from-tools-and-change-path.patch"
+md5sums="4eb35ccb163b8effdbd200a4634177b8  patchwork-1.1.0.tar.gz
+c0bf2a78294773e6a5dc5fb5c9b525cf  0001-support-busybox-readlink.patch
+2dde450ee27a24ea4b0448b1331e7cc9  0002-remove-uneeded-bashism-from-tools-and-change-path.patch"
+sha256sums="28fe96632b3eba23869aaba9d63cfc199440b772acfe38a8827241a5053629d0  patchwork-1.1.0.tar.gz
+43159a12dbbd4161ae1476c38b5435517dbc7260a1e25aa6263038cc4c267b99  0001-support-busybox-readlink.patch
+499fc47ac715901fe0a5f5043f7ee722ab39e694451c70982830e1c728ea136d  0002-remove-uneeded-bashism-from-tools-and-change-path.patch"
+sha512sums="9b8308cb210fac58163a0f4acb3d8105593ed3c60c673f9e372b9ef27366aca3af34a0143a936939ef05a7fbb303e739924a427b31905e6773e24e19f938b57b  patchwork-1.1.0.tar.gz
+a5d4e24741b66092a39c1ef4fdc76dffa1ddf87a69544ab0c374fb0701b0f7340a62ead86835d9bb412df5713f3ea3c0218e9e2e0cd01d9a1aad9414a3cc75fa  0001-support-busybox-readlink.patch
+12d1b184c6cb1d3f2c51adab6b60638e4869e055e677897bb66ee1a52312e77817bec543842324e2cbc2c226f3ab9d11c3782b5ef3a6f5f5712996cadbc6c9c9  0002-remove-uneeded-bashism-from-tools-and-change-path.patch"