From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
Date: Sat, 21 May 2011 16:41:38 +0000 (UTC) [thread overview]
Message-ID: <195dcc0febedc607891d19986e922c0ebb7d0d22.nirbheek@gentoo> (raw)
commit: 195dcc0febedc607891d19986e922c0ebb7d0d22
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri May 20 23:21:14 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat May 21 16:34:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=195dcc0f
gnome-keyring-3.0.2 version bump + libcap automagic dep fix
* Bump gnome-keyring to 3.0.2-r200 and -r300.
* Correct dependency in 9999 (libcap-ng, not libcap)
* Correct sed in 9999 (no Makefile.in)
* Add patches to make libcap (and libcap-ng, for 9999) dependencies
non-automagic. Patches submitted to upstream bug 649936
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
.../gnome-keyring-3.0.2-automagic-libcap.patch | 57 +++++++++++++++++++
.../gnome-keyring-3.1.1-automagic-libcap-ng.patch | 60 ++++++++++++++++++++
...r200.ebuild => gnome-keyring-3.0.2-r200.ebuild} | 15 +++--
...r300.ebuild => gnome-keyring-3.0.2-r300.ebuild} | 15 +++--
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 14 +++--
5 files changed, 143 insertions(+), 18 deletions(-)
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
new file mode 100644
index 0000000..2947af3
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
@@ -0,0 +1,57 @@
+From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 20 May 2011 17:53:43 -0400
+Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)
+
+Backport of the patch by Saleem Abdulrasool <compnerd@compnerd.org>
+to gnome-keyring-3.0.x
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+ configure.in | 29 +++++++++++++++++++++--------
+ 1 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index b2d07a7..88f7e66 100644
+--- a/configure.in
++++ b/configure.in
+@@ -445,16 +445,29 @@ fi
+ # libcap2
+ #
+
+-AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
+-
+-if test $have_libcap = yes; then
+- AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
+- DAEMON_LIBS="$DAEMON_LIBS -lcap"
+-else
+- AC_MSG_WARN([libcap2 (or development headers) is not installed])
++AC_ARG_WITH([libcap],
++ [AC_HELP_STRING([--without-libcap],
++ [build without libcap2 (disables Linux capabilities support)])],,
++ [with_libcap=auto])
++
++if test x"$with_libcap" != x"no" ; then
++ AC_CHECK_LIB([cap], [cap_get_proc],
++ [
++ with_libcap="yes"
++ AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
++ DAEMON_LIBS="$DAEMON_LIBS -lcap"
++ ],
++ [
++ if test x"$with_libcap" = x"yes" ; then
++ AC_MSG_ERROR([libcap2 support requested, but package not found])
++ else
++ AC_MSG_WARN([libcap2 (or development headers) is not installed])
++ fi
++ with_libcap="no"
++ ])
+ fi
+
+-libcap_status=$have_libcap
++libcap_status=$with_libcap
+
+ # --------------------------------------------------------------------
+ # Debug mode
+--
+1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch
new file mode 100644
index 0000000..b87bae3
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch
@@ -0,0 +1,60 @@
+From 8191a26b9717f0b0b8beabdc765cc3c4713b2586 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 20 May 2011 18:06:00 -0400
+Subject: [PATCH] Fix automagic libcap-ng dependency (GNOME bug #649936)
+
+A slight modification of the patch by Saleem Abdulrasool
+<compnerd@compnerd.org>. Like his patch, this is for 3.1.x.
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+ configure.ac | 32 ++++++++++++++++++++++----------
+ 1 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d9e947a..02372d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -451,18 +451,30 @@ fi
+ # libcap-ng
+ #
+
+-AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng="yes", have_libcapng="no")
+-
+-if test "$have_libcapng" = "yes"; then
+- AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng library])
+- DAEMON_LIBS="$DAEMON_LIBS -lcap-ng"
+-else
+- have_lipcapng="no"
+- AC_MSG_WARN([libcap-ng (or development headers) is not installed])
++AC_ARG_WITH([libcap-ng],
++ [AC_HELP_STRING([--without-libcap-ng],
++ [build without libcap-ng (disables Linux capabilities support)])],,
++ [with_libcap_ng=auto])
++
++if test x"$with_libcap_ng" != x"no" ; then
++ AC_CHECK_LIB([cap-ng], [capng_clear],
++ [
++ with_libcap_ng="yes"
++ AC_DEFINE([HAVE_LIBCAPNG], [1], [have libcap-ng headers and library])
++ DAEMON_LIBS="$DAEMON_LIBS -lcap-ng"
++ ],
++ [
++ if test x"$with_libcap_ng" = x"yes" ; then
++ AC_MSG_ERROR([libcap-ng support requested, but package not found])
++ else
++ AC_MSG_WARN([libcap-ng (or development headers) is not installed])
++ fi
++ with_libcap_ng="no"
++ ])
+ fi
+
+-AM_CONDITIONAL(WITH_CAPS, test "$have_libcapng" = "yes")
+-libcapng_status=$have_libcapng
++AM_CONDITIONAL([WITH_CAPS], [test x"$with_libcap_ng" = x"yes"])
++libcapng_status="$with_libcap_ng"
+
+ # --------------------------------------------------------------------
+ # Debug mode
+--
+1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild
similarity index 84%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild
index cfe1dea..bc6d16d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib pam virtualx
+inherit autotools eutils gnome2 multilib pam virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="debug doc pam test"
+IUSE="+caps debug doc pam test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -31,13 +31,13 @@ RDEPEND=">=dev-libs/glib-2.25:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- sys-libs/libcap
-
+ caps? ( sys-libs/libcap )
pam? ( virtual/pam )
"
# valgrind? ( dev-util/valgrind )
DEPEND="${RDEPEND}
sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.9
doc? ( >=dev-util/gtk-doc-1.9 )"
@@ -47,10 +47,10 @@ PDEPEND="gnome-base/libgnome-keyring"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
- # XXX: Automagic libcap support
G2CONF="${G2CONF}
$(use_enable debug)
$(use_enable test tests)
+ $(use_with caps libcap)
$(use_enable pam)
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
@@ -64,8 +64,11 @@ src_prepare() {
# Disable gcr tests due to weirdness with opensc
# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
+ -i gcr/Makefile.* || die "sed failed"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=649936
+ epatch "${FILESDIR}"/${P}-automagic-libcap.patch
+ eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild
similarity index 85%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild
index 032bc34..257766f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib pam virtualx
+inherit autotools eutils gnome2 multilib pam virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="debug doc pam test"
+IUSE="+caps debug doc pam test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,13 +33,13 @@ RDEPEND=">=dev-libs/glib-2.25:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- sys-libs/libcap
-
+ caps? ( sys-libs/libcap )
pam? ( virtual/pam )
"
# valgrind? ( dev-util/valgrind )
DEPEND="${RDEPEND}
sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.9
doc? ( >=dev-util/gtk-doc-1.9 )"
@@ -49,10 +49,10 @@ PDEPEND="gnome-base/libgnome-keyring"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
- # XXX: Automagic libcap support
G2CONF="${G2CONF}
$(use_enable debug)
$(use_enable test tests)
+ $(use_with caps libcap)
$(use_enable pam)
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
@@ -66,8 +66,11 @@ src_prepare() {
# Disable gcr tests due to weirdness with opensc
# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
+ -i gcr/Makefile.* || die "sed failed"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=649936
+ epatch "${FILESDIR}"/${P}-automagic-libcap.patch
+ eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 032bc34..cc9c315 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib pam virtualx
+inherit autotools eutils gnome2 multilib pam virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="debug doc pam test"
+IUSE="+caps debug doc pam test"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,13 +33,13 @@ RDEPEND=">=dev-libs/glib-2.25:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- sys-libs/libcap
-
+ caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
# valgrind? ( dev-util/valgrind )
DEPEND="${RDEPEND}
sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.9
doc? ( >=dev-util/gtk-doc-1.9 )"
@@ -49,10 +49,10 @@ PDEPEND="gnome-base/libgnome-keyring"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
- # XXX: Automagic libcap support
G2CONF="${G2CONF}
$(use_enable debug)
$(use_enable test tests)
+ $(use_with caps libcap-ng)
$(use_enable pam)
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
@@ -66,8 +66,10 @@ src_prepare() {
# Disable gcr tests due to weirdness with opensc
# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
+ -i gcr/Makefile.* || die "sed failed"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=649936
+ epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
gnome2_src_prepare
}
next reply other threads:[~2011-05-21 16:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 16:41 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-09 11:34 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/ Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=195dcc0febedc607891d19986e922c0ebb7d0d22.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox