main/polkit: fix parallel make, and update url

author: Timo Teräs <timo.teras@iki.fi> 2014-04-15 13:56:24 +0300
committer: Timo Teräs <timo.teras@iki.fi> 2014-04-15 13:56:24 +0300
commit: 0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b (patch)
tree: 6f417fe1ca8569e4dfdcdf27822468a68f0c3ee6
parent: bb62ff0be2acc91f2a2ed37e0314f0088684aef3 (diff)
download: alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.tar.bz2
alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.tar.xz
alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.zip
2 files changed, 49 insertions, 5 deletions
diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD
index 619dd1ee8d..e12a0b2364 100644
--- a/main/polkit/APKBUILD
+++ b/main/polkit/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=polkit
 pkgver=0.105
-pkgrel=2
+pkgrel=3
 pkgdesc="Application development toolkit for controlling system-wide privileges"
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
+url="http://www.freedesktop.org/wiki/Software/polkit/"
 arch="all"
 license="LGPL"
 depends=
@@ -17,6 +17,7 @@ source="http://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.g
        0001-Bug-50145-make-netgroup-support-optional.patch
        CVE-2013-4288.patch
        automake.patch
+        fix-parallel-make.patch
 "
 _builddir="$srcdir"/polkit-$pkgver
@@ -66,12 +67,15 @@ package() {
 md5sums="9c29e1b6c214f0bd6f1d4ee303dfaed9  polkit-0.105.tar.gz
 bb4e7bffa5bad89bf3033b3d866a4087  0001-Bug-50145-make-netgroup-support-optional.patch
 2f2b7a0a5e79516582ce12a80c5677a2  CVE-2013-4288.patch
-38dfb2ffefa4f84d64e4cd93fda145f2  automake.patch"
+38dfb2ffefa4f84d64e4cd93fda145f2  automake.patch
+cca56781a0ac23c0c56b5390fc8f8238  fix-parallel-make.patch"
 sha256sums="8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df  polkit-0.105.tar.gz
 80bf119937c5b75887bf6405e69e364a31e6e2edcac7957816ed7d8ea6b2a5a3  0001-Bug-50145-make-netgroup-support-optional.patch
 394be8089e90ed662af0b2043fa6abdda0c062d89970ce5f5a25df8633123d5e  CVE-2013-4288.patch
-de9e99ec691e45fc204eba576e301299952c0eb13ecedcb7399ba1b6aab94200  automake.patch"
+de9e99ec691e45fc204eba576e301299952c0eb13ecedcb7399ba1b6aab94200  automake.patch
+fb0352d687b4b23acace3d211d9f48635d2eae43f5a478cbdda0f1e42784f735  fix-parallel-make.patch"
 sha512sums="7c0f84b9639814b4690e42b570285ff2018a5ea4cfd7216d9abf44c84ece6592c530f2d6211511c1346963daf4f135e9fa79d1b2f592b454115950991b5e4bc3  polkit-0.105.tar.gz
 09ca9c14044c0a281e9069919efbb6d14918f23f58a282b5ce25c8a6640966396904373822869fe994c711f40c33d5c34cf3b77f85a59e239ba3d0c22a31ca8e  0001-Bug-50145-make-netgroup-support-optional.patch
 d6de3beb063243c11906f525ef2eb65aeca823c25b1f44dde4a16f4fc2c5ce587b129e0bfb25a4a4b88ac2bf5713c47e57700c139323d961c9f9b6ba4c03fffb  CVE-2013-4288.patch
-25465a23332247d0873e24cb5f011a267413615526755a8295a6367d64fc5eb8c2aa3c9c1fdcfa183b39e3ece14f33b25f15a339d966a31f3feb861b3f17adbf  automake.patch"
+25465a23332247d0873e24cb5f011a267413615526755a8295a6367d64fc5eb8c2aa3c9c1fdcfa183b39e3ece14f33b25f15a339d966a31f3feb861b3f17adbf  automake.patch
+6b0d9262ba8b3c000acdcc8c86bd6fc043e5750a0155730638d4e3a92e63f43cb476d63b11856c041d60d8f38f7eb5ada0eb0eced9100bdac3bc2c7dd5108ddd  fix-parallel-make.patch"
diff --git a/main/polkit/fix-parallel-make.patch b/main/polkit/fix-parallel-make.patch
new file mode 100644
index 0000000000..b693a34ddc
--- /dev/null
+++ b/main/polkit/fix-parallel-make.patch
@@ -0,0 +1,40 @@
+From 7bd30764a5230684c7c979a08a83dfa6e327f719 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@velocity.(none)>
+Date: Tue, 13 Nov 2012 16:50:14 +0000
+Subject: build: Fix .gir generation for parallel make
+As per the intructions in the introspection Makefile, we should have a
+line declaring a dependency between the .gir and .la files.
+https://bugs.freedesktop.org/show_bug.cgi?id=57077
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+---
+diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
+index 39d6d84..d648d29 100644
+--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
+@@ -106,6 +106,8 @@ if HAVE_INTROSPECTION
+ 
+ INTROSPECTION_GIRS = Polkit-1.0.gir
+ 
+Polkit-1.0.gir: libpolkit-gobject-1.la
+
+ girdir = $(INTROSPECTION_GIRDIR)
+ gir_DATA = Polkit-1.0.gir
+ 
+diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
+index 1cfb73c..5b7d4c7 100644
+--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
+@@ -108,6 +108,8 @@ if HAVE_INTROSPECTION
+ girdir = $(INTROSPECTION_GIRDIR)
+ gir_DATA = PolkitAgent-1.0.gir
+ 
+PolkitAgent-1.0.gir: libpolkit-agent-1.la
+
+ typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+ typelibs_DATA = PolkitAgent-1.0.typelib
+ 
+--
+cgit v0.9.0.2-2-gbebe
author	Timo Teräs <timo.teras@iki.fi>	2014-04-15 13:56:24 +0300
committer	Timo Teräs <timo.teras@iki.fi>	2014-04-15 13:56:24 +0300
commit	0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b (patch)
tree	6f417fe1ca8569e4dfdcdf27822468a68f0c3ee6
parent	bb62ff0be2acc91f2a2ed37e0314f0088684aef3 (diff)
download	alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.tar.bz2 alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.tar.xz alpine_aports-0a7a893f64cb0bddefb5a7ca2593fd95bbf43e7b.zip

diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD index 619dd1ee8d..e12a0b2364 100644 --- a/main/polkit/APKBUILD +++ b/main/polkit/APKBUILD
@@ -2,9 +2,9 @@
2	# Maintainer: Natanael Copa <ncopa@alpinelinux.org>	2	# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
3	pkgname=polkit	3	pkgname=polkit
4	pkgver=0.105	4	pkgver=0.105
5	pkgrel=2	5	pkgrel=3
6	pkgdesc="Application development toolkit for controlling system-wide privileges"	6	pkgdesc="Application development toolkit for controlling system-wide privileges"
7	url="http://www.freedesktop.org/wiki/Software/PolicyKit"	7	url="http://www.freedesktop.org/wiki/Software/polkit/"
8	arch="all"	8	arch="all"
9	license="LGPL"	9	license="LGPL"
10	depends=	10	depends=
@@ -17,6 +17,7 @@ source="http://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.g
17	0001-Bug-50145-make-netgroup-support-optional.patch	17	0001-Bug-50145-make-netgroup-support-optional.patch
18	CVE-2013-4288.patch	18	CVE-2013-4288.patch
19	automake.patch	19	automake.patch
		20	fix-parallel-make.patch
20	"	21	"
21		22
22	_builddir="$srcdir"/polkit-$pkgver	23	_builddir="$srcdir"/polkit-$pkgver
@@ -66,12 +67,15 @@ package() {
66	md5sums="9c29e1b6c214f0bd6f1d4ee303dfaed9 polkit-0.105.tar.gz	67	md5sums="9c29e1b6c214f0bd6f1d4ee303dfaed9 polkit-0.105.tar.gz
67	bb4e7bffa5bad89bf3033b3d866a4087 0001-Bug-50145-make-netgroup-support-optional.patch	68	bb4e7bffa5bad89bf3033b3d866a4087 0001-Bug-50145-make-netgroup-support-optional.patch
68	2f2b7a0a5e79516582ce12a80c5677a2 CVE-2013-4288.patch	69	2f2b7a0a5e79516582ce12a80c5677a2 CVE-2013-4288.patch
69	38dfb2ffefa4f84d64e4cd93fda145f2 automake.patch"	70	38dfb2ffefa4f84d64e4cd93fda145f2 automake.patch
		71	cca56781a0ac23c0c56b5390fc8f8238 fix-parallel-make.patch"
70	sha256sums="8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df polkit-0.105.tar.gz	72	sha256sums="8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df polkit-0.105.tar.gz
71	80bf119937c5b75887bf6405e69e364a31e6e2edcac7957816ed7d8ea6b2a5a3 0001-Bug-50145-make-netgroup-support-optional.patch	73	80bf119937c5b75887bf6405e69e364a31e6e2edcac7957816ed7d8ea6b2a5a3 0001-Bug-50145-make-netgroup-support-optional.patch
72	394be8089e90ed662af0b2043fa6abdda0c062d89970ce5f5a25df8633123d5e CVE-2013-4288.patch	74	394be8089e90ed662af0b2043fa6abdda0c062d89970ce5f5a25df8633123d5e CVE-2013-4288.patch
73	de9e99ec691e45fc204eba576e301299952c0eb13ecedcb7399ba1b6aab94200 automake.patch"	75	de9e99ec691e45fc204eba576e301299952c0eb13ecedcb7399ba1b6aab94200 automake.patch
		76	fb0352d687b4b23acace3d211d9f48635d2eae43f5a478cbdda0f1e42784f735 fix-parallel-make.patch"
74	sha512sums="7c0f84b9639814b4690e42b570285ff2018a5ea4cfd7216d9abf44c84ece6592c530f2d6211511c1346963daf4f135e9fa79d1b2f592b454115950991b5e4bc3 polkit-0.105.tar.gz	77	sha512sums="7c0f84b9639814b4690e42b570285ff2018a5ea4cfd7216d9abf44c84ece6592c530f2d6211511c1346963daf4f135e9fa79d1b2f592b454115950991b5e4bc3 polkit-0.105.tar.gz
75	09ca9c14044c0a281e9069919efbb6d14918f23f58a282b5ce25c8a6640966396904373822869fe994c711f40c33d5c34cf3b77f85a59e239ba3d0c22a31ca8e 0001-Bug-50145-make-netgroup-support-optional.patch	78	09ca9c14044c0a281e9069919efbb6d14918f23f58a282b5ce25c8a6640966396904373822869fe994c711f40c33d5c34cf3b77f85a59e239ba3d0c22a31ca8e 0001-Bug-50145-make-netgroup-support-optional.patch
76	d6de3beb063243c11906f525ef2eb65aeca823c25b1f44dde4a16f4fc2c5ce587b129e0bfb25a4a4b88ac2bf5713c47e57700c139323d961c9f9b6ba4c03fffb CVE-2013-4288.patch	79	d6de3beb063243c11906f525ef2eb65aeca823c25b1f44dde4a16f4fc2c5ce587b129e0bfb25a4a4b88ac2bf5713c47e57700c139323d961c9f9b6ba4c03fffb CVE-2013-4288.patch
77	25465a23332247d0873e24cb5f011a267413615526755a8295a6367d64fc5eb8c2aa3c9c1fdcfa183b39e3ece14f33b25f15a339d966a31f3feb861b3f17adbf automake.patch"	80	25465a23332247d0873e24cb5f011a267413615526755a8295a6367d64fc5eb8c2aa3c9c1fdcfa183b39e3ece14f33b25f15a339d966a31f3feb861b3f17adbf automake.patch
		81	6b0d9262ba8b3c000acdcc8c86bd6fc043e5750a0155730638d4e3a92e63f43cb476d63b11856c041d60d8f38f7eb5ada0eb0eced9100bdac3bc2c7dd5108ddd fix-parallel-make.patch"


diff --git a/main/polkit/fix-parallel-make.patch b/main/polkit/fix-parallel-make.patch new file mode 100644 index 0000000000..b693a34ddc --- /dev/null +++ b/main/polkit/fix-parallel-make.patch
@@ -0,0 +1,40 @@
		1	From 7bd30764a5230684c7c979a08a83dfa6e327f719 Mon Sep 17 00:00:00 2001
		2	From: Ryan Lortie <desrt@velocity.(none)>
		3	Date: Tue, 13 Nov 2012 16:50:14 +0000
		4	Subject: build: Fix .gir generation for parallel make
		5
		6	As per the intructions in the introspection Makefile, we should have a
		7	line declaring a dependency between the .gir and .la files.
		8
		9	https://bugs.freedesktop.org/show_bug.cgi?id=57077
		10
		11	Signed-off-by: David Zeuthen <zeuthen@gmail.com>
		12	---
		13	diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
		14	index 39d6d84..d648d29 100644
		15	--- a/src/polkit/Makefile.am
		16	+++ b/src/polkit/Makefile.am
		17	@@ -106,6 +106,8 @@ if HAVE_INTROSPECTION
		18
		19	INTROSPECTION_GIRS = Polkit-1.0.gir
		20
		21	+Polkit-1.0.gir: libpolkit-gobject-1.la
		22	+
		23	girdir = $(INTROSPECTION_GIRDIR)
		24	gir_DATA = Polkit-1.0.gir
		25
		26	diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
		27	index 1cfb73c..5b7d4c7 100644
		28	--- a/src/polkitagent/Makefile.am
		29	+++ b/src/polkitagent/Makefile.am
		30	@@ -108,6 +108,8 @@ if HAVE_INTROSPECTION
		31	girdir = $(INTROSPECTION_GIRDIR)
		32	gir_DATA = PolkitAgent-1.0.gir
		33
		34	+PolkitAgent-1.0.gir: libpolkit-agent-1.la
		35	+
		36	typelibsdir = $(INTROSPECTION_TYPELIBDIR)
		37	typelibs_DATA = PolkitAgent-1.0.typelib
		38
		39	--
		40	cgit v0.9.0.2-2-gbebe