[arch-commits] Commit in gcr/repos/extra-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Wed May 2 23:24:21 UTC 2018
Date: Wednesday, May 2, 2018 @ 23:24:21
Author: heftig
Revision: 323331
archrelease: copy trunk to extra-x86_64
Added:
gcr/repos/extra-x86_64/0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch
(from rev 323330, gcr/trunk/0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch)
gcr/repos/extra-x86_64/10-gcr.conf
(from rev 323330, gcr/trunk/10-gcr.conf)
gcr/repos/extra-x86_64/PKGBUILD
(from rev 323330, gcr/trunk/PKGBUILD)
Deleted:
gcr/repos/extra-x86_64/10-gcr.conf
gcr/repos/extra-x86_64/PKGBUILD
-------------------------------------------------------------+
0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch | 115 ++++++++
10-gcr.conf | 6
PKGBUILD | 134 +++++-----
3 files changed, 185 insertions(+), 70 deletions(-)
Copied: gcr/repos/extra-x86_64/0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch (from rev 323330, gcr/trunk/0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch)
===================================================================
--- 0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch (rev 0)
+++ 0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch 2018-05-02 23:24:21 UTC (rev 323331)
@@ -0,0 +1,115 @@
+From 2c04198877dd8b25a787af6bd7928c6c7ddb86d2 Mon Sep 17 00:00:00 2001
+Message-Id: <2c04198877dd8b25a787af6bd7928c6c7ddb86d2.1524910574.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 28 Apr 2018 12:12:27 +0200
+Subject: [PATCH] Allow D-Bus to launch the prompter using systemd
+
+This applies only when a user bus is in use. It is a better fit for a
+system where the gpg-agent is also supervised and spawns pinentry-gnome3
+as a peer on the user bus.
+---
+ configure.ac | 11 +++++++++++
+ gcr/Makefile.am | 17 ++++++++++++-----
+ gcr/gcr-prompter.service.in | 7 +++++++
+ ...org.gnome.keyring.PrivatePrompter.service.in | 1 +
+ gcr/org.gnome.keyring.SystemPrompter.service.in | 1 +
+ 5 files changed, 32 insertions(+), 5 deletions(-)
+ create mode 100644 gcr/gcr-prompter.service.in
+
+diff --git a/configure.ac b/configure.ac
+index 06dfc0c..c8ace9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,6 +234,17 @@ fi
+
+ AC_SUBST(DBUS_SERVICES_DIR)
+
++AC_ARG_WITH(user-services,
++ [AC_HELP_STRING([--with-user-services=<dir>],
++ [where systemd user services directory is])])
++if ! test -z "$with_user_services" ; then
++ USER_SERVICES_DIR="$with_user_services"
++else
++ USER_SERVICES_DIR="$libdir/systemd/user"
++fi
++
++AC_SUBST(USER_SERVICES_DIR)
++
+ # --------------------------------------------------------------------
+ # Compilation and linking options
+ #
+diff --git a/gcr/Makefile.am b/gcr/Makefile.am
+index 692875b..15c1e8f 100644
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
+@@ -188,24 +188,31 @@ pkgconfig_DATA += \
+ gcr-base-$(GCR_MAJOR).pc: gcr/gcr-base.pc
+ $(AM_V_GEN) cp gcr/gcr-base.pc gcr-base-$(GCR_MAJOR).pc
+
+-service_in_files = \
++dbus_service_in_files = \
+ gcr/org.gnome.keyring.SystemPrompter.service.in \
+ gcr/org.gnome.keyring.PrivatePrompter.service.in
+-servicedir = $(DBUS_SERVICES_DIR)
+-service_DATA = $(service_in_files:.service.in=.service)
++dbus_servicedir = $(DBUS_SERVICES_DIR)
++dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
++
++user_service_in_files = \
++ gcr/gcr-prompter.service.in
++user_servicedir = $(USER_SERVICES_DIR)
++user_service_DATA = $(user_service_in_files:.service.in=.service)
+
+ EXTRA_DIST += \
+ gcr/gcr-base.pc.in \
+ gcr/gcr-marshal.list \
+ gcr/gcr-oids.list \
+ gcr/gcr-mkoids \
+ $(DBUS_XML_DEFINITIONS) \
+ gcr/gcr-base.symbols \
+- $(service_in_files) \
++ $(dbus_service_in_files) \
++ $(user_service_in_files) \
+ gcr/gcr-version.h.in
+
+ CLEANFILES += \
+- $(service_DATA) \
++ $(dbus_service_DATA) \
++ $(user_service_DATA) \
+ gcr-base-actual.abi \
+ gcr-base-expected.abi \
+ Gcr-3.broken.gir
+diff --git a/gcr/gcr-prompter.service.in b/gcr/gcr-prompter.service.in
+new file mode 100644
+index 0000000..11b20d6
+--- /dev/null
++++ b/gcr/gcr-prompter.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME crypto prompt UI service
++
++[Service]
++ExecStart=@libexecdir@/gcr-prompter
++Type=dbus
++BusName=org.gnome.keyring.SystemPrompter
+diff --git a/gcr/org.gnome.keyring.PrivatePrompter.service.in b/gcr/org.gnome.keyring.PrivatePrompter.service.in
+index 542a376..a3aa8aa 100644
+--- a/gcr/org.gnome.keyring.PrivatePrompter.service.in
++++ b/gcr/org.gnome.keyring.PrivatePrompter.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.keyring.PrivatePrompter
+ Exec=@libexecdir@/gcr-prompter
++SystemdService=gcr-prompter.service
+diff --git a/gcr/org.gnome.keyring.SystemPrompter.service.in b/gcr/org.gnome.keyring.SystemPrompter.service.in
+index 8d0063c..4add95a 100644
+--- a/gcr/org.gnome.keyring.SystemPrompter.service.in
++++ b/gcr/org.gnome.keyring.SystemPrompter.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.keyring.SystemPrompter
+ Exec=@libexecdir@/gcr-prompter
++SystemdService=gcr-prompter.service
+--
+2.17.0
+
Deleted: 10-gcr.conf
===================================================================
--- 10-gcr.conf 2018-05-02 23:23:13 UTC (rev 323330)
+++ 10-gcr.conf 2018-05-02 23:24:21 UTC (rev 323331)
@@ -1,3 +0,0 @@
- at users - memlock 1024
-
-# vim:set ft=limits:
Copied: gcr/repos/extra-x86_64/10-gcr.conf (from rev 323330, gcr/trunk/10-gcr.conf)
===================================================================
--- 10-gcr.conf (rev 0)
+++ 10-gcr.conf 2018-05-02 23:24:21 UTC (rev 323331)
@@ -0,0 +1,3 @@
+ at users - memlock 1024
+
+# vim:set ft=limits:
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-02 23:23:13 UTC (rev 323330)
+++ PKGBUILD 2018-05-02 23:24:21 UTC (rev 323331)
@@ -1,67 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gcr
-pkgver=3.28.0
-pkgrel=2
-pkgdesc="A library for bits of crypto UI and parsing"
-url="https://git.gnome.org/browse/gcr"
-arch=(x86_64)
-license=(GPL2)
-depends=(dconf gtk3 libgcrypt p11-kit)
-makedepends=(intltool gobject-introspection python vala libxslt git gtk-doc)
-checkdepends=(python2)
-_commit=aa4e0535a6f8e6bd6834a630ba2ea7b8990e402c # tags/3.28.0^0
-source=("git+https://git.gnome.org/browse/gcr#commit=$_commit"
- 0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch
- 10-gcr.conf)
-sha256sums=('SKIP'
- '464b395618dfbbb827a812de56deb3ca22ceb99010885c8f43dae22cfd66278d'
- '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=795626
- patch -Np1 -i ../0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch
-
- sed -i '1s/python$/&2/' build/tap-{driver,gtester}
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-gtk-doc \
- --disable-static \
- --disable-update-mime \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgname
- # Secure memory tests fail
- dbus-run-session make -k check || :
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- # gcr wants to lock some memory to prevent swapping out private keys
- # https://bugs.archlinux.org/task/32616
- # https://bugzilla.gnome.org/show_bug.cgi?id=688161
- install -Dt "$pkgdir/etc/security/limits.d" -m644 ../10-gcr.conf
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gcr/repos/extra-x86_64/PKGBUILD (from rev 323330, gcr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-02 23:24:21 UTC (rev 323331)
@@ -0,0 +1,67 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gcr
+pkgver=3.28.0
+pkgrel=3
+pkgdesc="A library for bits of crypto UI and parsing"
+url="https://git.gnome.org/browse/gcr"
+arch=(x86_64)
+license=(GPL2)
+depends=(dconf gtk3 libgcrypt p11-kit)
+makedepends=(intltool gobject-introspection python vala libxslt git gtk-doc)
+checkdepends=(python2)
+_commit=aa4e0535a6f8e6bd6834a630ba2ea7b8990e402c # tags/3.28.0^0
+source=("git+https://git.gnome.org/browse/gcr#commit=$_commit"
+ 0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch
+ 10-gcr.conf)
+sha256sums=('SKIP'
+ '464b395618dfbbb827a812de56deb3ca22ceb99010885c8f43dae22cfd66278d'
+ '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=795626
+ patch -Np1 -i ../0001-Allow-D-Bus-to-launch-the-prompter-using-systemd.patch
+
+ sed -i '1s/python$/&2/' build/tap-{driver,gtester}
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-gtk-doc \
+ --disable-static \
+ --disable-update-mime \
+ --disable-schemas-compile
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd $pkgname
+ # Secure memory tests fail
+ dbus-run-session make -k check || :
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ # gcr wants to lock some memory to prevent swapping out private keys
+ # https://bugs.archlinux.org/task/32616
+ # https://bugzilla.gnome.org/show_bug.cgi?id=688161
+ install -Dt "$pkgdir/etc/security/limits.d" -m644 ../10-gcr.conf
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list