From 62bce78b03ac257d215b380922a4021c8cbf637a Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 23 Apr 2015 10:11:32 +0200 Subject: testing/patchwork: move to main --- ...lient-set-default-url-to-alpine-patchwork.patch | 25 ++++++ main/patchwork/0001-support-busybox-readlink.patch | 25 ++++++ .../patchwork/0001-use-webapps-dir-structure.patch | 45 +++++++++++ main/patchwork/APKBUILD | 90 ++++++++++++++++++++++ ...lient-set-default-url-to-alpine-patchwork.patch | 25 ------ .../patchwork/0001-support-busybox-readlink.patch | 25 ------ .../patchwork/0001-use-webapps-dir-structure.patch | 45 ----------- testing/patchwork/APKBUILD | 90 ---------------------- 8 files changed, 185 insertions(+), 185 deletions(-) create mode 100644 main/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch create mode 100644 main/patchwork/0001-support-busybox-readlink.patch create mode 100644 main/patchwork/0001-use-webapps-dir-structure.patch create mode 100644 main/patchwork/APKBUILD delete mode 100644 testing/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch delete mode 100644 testing/patchwork/0001-support-busybox-readlink.patch delete mode 100644 testing/patchwork/0001-use-webapps-dir-structure.patch delete mode 100644 testing/patchwork/APKBUILD diff --git a/main/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch b/main/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch new file mode 100644 index 0000000000..511e9042f1 --- /dev/null +++ b/main/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch @@ -0,0 +1,25 @@ +From 304b9f210a6edccc33b5ead321b43f02884aca62 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Thu, 23 Apr 2015 10:01:18 +0200 +Subject: [PATCH] pwclient set default url to alpine patchwork + +--- + apps/patchwork/bin/pwclient | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient +index 2a80981..b1adad3 100755 +--- a/apps/patchwork/bin/pwclient ++++ b/apps/patchwork/bin/pwclient +@@ -35,7 +35,7 @@ import re + # This script will check the PW_XMLRPC_URL environment variable + # for the URL to access. If that is unspecified, it will fallback to + # the hardcoded default value specified here. +-DEFAULT_URL = "http://patchwork/xmlrpc/" ++DEFAULT_URL = "http://patchwork.alpinelinux.org/xmlrpc/" + CONFIG_FILE = os.path.expanduser('~/.pwclientrc') + + class Filter: +-- +2.3.5 + diff --git a/main/patchwork/0001-support-busybox-readlink.patch b/main/patchwork/0001-support-busybox-readlink.patch new file mode 100644 index 0000000000..9bc3f9dda0 --- /dev/null +++ b/main/patchwork/0001-support-busybox-readlink.patch @@ -0,0 +1,25 @@ +From 44204d6be590cc7ad721be0b08d95c17355c0fda Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +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 +@@ -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/../../..` + + PYTHONPATH="$PATCHWORK_BASE/apps":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \ + DJANGO_SETTINGS_MODULE=settings \ +-- +2.3.5 + diff --git a/main/patchwork/0001-use-webapps-dir-structure.patch b/main/patchwork/0001-use-webapps-dir-structure.patch new file mode 100644 index 0000000000..723737f9de --- /dev/null +++ b/main/patchwork/0001-use-webapps-dir-structure.patch @@ -0,0 +1,45 @@ +From 19538be6d68f463ef3711054da4c68b32325e63b Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +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 @@ + +- 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" +- ++ 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" ++ + Order allow,deny + Allow from all + + +- 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/" + +- ++ + Order allow,deny + Allow from all + + + +-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/APKBUILD b/main/patchwork/APKBUILD new file mode 100644 index 0000000000..7a1eb129cb --- /dev/null +++ b/main/patchwork/APKBUILD @@ -0,0 +1,90 @@ +# Contributor: Francesco Colista +# Maintainer: Francesco Colista +pkgname=patchwork +pkgver=0_git20150420 +pkgrel=5 +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_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 + 0001-support-busybox-readlink.patch + 0001-use-webapps-dir-structure.patch + 0001-pwclient-set-default-url-to-alpine-patchwork.patch" +giturl="git://ozlabs.org/home/jk/git/patchwork" +disturl="dev.alpinelinux.org:/archive/$pkgname/" +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + return 0 +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/share/webapps/$pkgname + 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 + mv * "$pkgdir"/usr/share/webapps/$pkgname + cd "$pkgdir"/usr/share/webapps/patchwork/apps + ln -sf /etc/patchwork/local_settings.py || return 1 +} + +apache2_wsgi() { + pkgdesc="$pkgname apache2 wsgi support" + depends="apache2 apache2-mod-wsgi" + install_if="apache2-mod-wsgi" + install -Dm644 "$pkgdir"/usr/share/webapps/patchwork/lib/apache2/patchwork.wsgi.conf \ + "$subpkgdir"/etc/apache2/conf.d/patchwork.wsgi.conf || return 1 +} + +mysql() { + pkgdesc="$pkgname mysql support" + depends="py-mysqldb" + mkdir -p "$subpkgdir" +} + +postgresql() { + pkgdesc="$pkgname postgresql support" + depends="py-psycopg2" + mkdir -p "$subpkgdir" +} + +pwclient() { + pkgdesc="command-line client for patchwork" + depends="python" + install -Dm775 "$pkgdir"/usr/share/webapps/patchwork/apps/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" +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" +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" diff --git a/testing/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch b/testing/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch deleted file mode 100644 index 511e9042f1..0000000000 --- a/testing/patchwork/0001-pwclient-set-default-url-to-alpine-patchwork.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 304b9f210a6edccc33b5ead321b43f02884aca62 Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter -Date: Thu, 23 Apr 2015 10:01:18 +0200 -Subject: [PATCH] pwclient set default url to alpine patchwork - ---- - apps/patchwork/bin/pwclient | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient -index 2a80981..b1adad3 100755 ---- a/apps/patchwork/bin/pwclient -+++ b/apps/patchwork/bin/pwclient -@@ -35,7 +35,7 @@ import re - # This script will check the PW_XMLRPC_URL environment variable - # for the URL to access. If that is unspecified, it will fallback to - # the hardcoded default value specified here. --DEFAULT_URL = "http://patchwork/xmlrpc/" -+DEFAULT_URL = "http://patchwork.alpinelinux.org/xmlrpc/" - CONFIG_FILE = os.path.expanduser('~/.pwclientrc') - - class Filter: --- -2.3.5 - diff --git a/testing/patchwork/0001-support-busybox-readlink.patch b/testing/patchwork/0001-support-busybox-readlink.patch deleted file mode 100644 index 9bc3f9dda0..0000000000 --- a/testing/patchwork/0001-support-busybox-readlink.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 44204d6be590cc7ad721be0b08d95c17355c0fda Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter -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 -@@ -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/../../..` - - PYTHONPATH="$PATCHWORK_BASE/apps":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=settings \ --- -2.3.5 - diff --git a/testing/patchwork/0001-use-webapps-dir-structure.patch b/testing/patchwork/0001-use-webapps-dir-structure.patch deleted file mode 100644 index 723737f9de..0000000000 --- a/testing/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 -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 @@ - -- 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" -- -+ 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" -+ - Order allow,deny - Allow from all - - -- 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/" - -- -+ - Order allow,deny - Allow from all - - - --WSGIScriptAlias / "/srv/patchwork/lib/apache2/patchwork.wsgi" -+WSGIScriptAlias / "/usr/share/webapps/patchwork/lib/apache2/patchwork.wsgi" - WSGIPassAuthorization On --- -2.3.5 - diff --git a/testing/patchwork/APKBUILD b/testing/patchwork/APKBUILD deleted file mode 100644 index 7a1eb129cb..0000000000 --- a/testing/patchwork/APKBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# Contributor: Francesco Colista -# Maintainer: Francesco Colista -pkgname=patchwork -pkgver=0_git20150420 -pkgrel=5 -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_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 - 0001-support-busybox-readlink.patch - 0001-use-webapps-dir-structure.patch - 0001-pwclient-set-default-url-to-alpine-patchwork.patch" -giturl="git://ozlabs.org/home/jk/git/patchwork" -disturl="dev.alpinelinux.org:/archive/$pkgname/" -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - return 0 -} - -package() { - cd "$_builddir" - mkdir -p "$pkgdir"/usr/share/webapps/$pkgname - 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 - mv * "$pkgdir"/usr/share/webapps/$pkgname - cd "$pkgdir"/usr/share/webapps/patchwork/apps - ln -sf /etc/patchwork/local_settings.py || return 1 -} - -apache2_wsgi() { - pkgdesc="$pkgname apache2 wsgi support" - depends="apache2 apache2-mod-wsgi" - install_if="apache2-mod-wsgi" - install -Dm644 "$pkgdir"/usr/share/webapps/patchwork/lib/apache2/patchwork.wsgi.conf \ - "$subpkgdir"/etc/apache2/conf.d/patchwork.wsgi.conf || return 1 -} - -mysql() { - pkgdesc="$pkgname mysql support" - depends="py-mysqldb" - mkdir -p "$subpkgdir" -} - -postgresql() { - pkgdesc="$pkgname postgresql support" - depends="py-psycopg2" - mkdir -p "$subpkgdir" -} - -pwclient() { - pkgdesc="command-line client for patchwork" - depends="python" - install -Dm775 "$pkgdir"/usr/share/webapps/patchwork/apps/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" -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" -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" -- cgit v1.2.3