[arch-commits] Commit in gcr/repos/extra-x86_64 (4 files)
Jan Steffens
heftig at gemini.archlinux.org
Fri Apr 1 18:52:17 UTC 2022
Date: Friday, April 1, 2022 @ 18:52:17
Author: heftig
Revision: 441177
archrelease: copy trunk to extra-x86_64
Added:
gcr/repos/extra-x86_64/PKGBUILD
(from rev 441176, gcr/trunk/PKGBUILD)
gcr/repos/extra-x86_64/gcr.install
(from rev 441176, gcr/trunk/gcr.install)
Deleted:
gcr/repos/extra-x86_64/PKGBUILD
gcr/repos/extra-x86_64/gcr.install
-------------+
PKGBUILD | 104 ++++++++++++++++++++++++++++++----------------------------
gcr.install | 40 +++++++++++-----------
2 files changed, 74 insertions(+), 70 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-01 18:52:05 UTC (rev 441176)
+++ PKGBUILD 2022-04-01 18:52:17 UTC (rev 441177)
@@ -1,50 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gcr
-pkgver=3.41.0
-pkgrel=1
-pkgdesc="A library for bits of crypto UI and parsing"
-url="https://gitlab.gnome.org/GNOME/gcr"
-arch=(x86_64)
-license=(GPL2)
-depends=(gtk3 libgcrypt p11-kit openssh libsecret)
-makedepends=(gobject-introspection vala libxslt git gtk-doc meson)
-provides=(libgck-1.so libgcr-{base,ui}-3.so)
-_commit=f5026a8c9c7d78372b3efeca3412b0e40011ce11 # tags/3.41.0^0
-backup=(etc/security/limits.d/10-gcr.conf)
-install=gcr.install
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd gcr
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd gcr
-}
-
-build() {
- arch-meson gcr build
- meson compile -C build
-}
-
-check() {
- # Secure memory tests fail
- dbus-run-session meson test -C build --print-errorlogs || :
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-
- # 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 -Dm644 /dev/stdin "$pkgdir/etc/security/limits.d/10-gcr.conf" <<END
- at users - memlock 1024
-END
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gcr/repos/extra-x86_64/PKGBUILD (from rev 441176, gcr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-01 18:52:17 UTC (rev 441177)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gcr
+pkgver=3.41.0
+pkgrel=2
+pkgdesc="A library for bits of crypto UI and parsing"
+url="https://gitlab.gnome.org/GNOME/gcr"
+arch=(x86_64)
+license=(GPL2)
+depends=(gtk3 libgcrypt p11-kit openssh libsecret)
+makedepends=(gobject-introspection vala libxslt git gtk-doc meson)
+provides=(libgck-1.so libgcr-{base,ui}-3.so)
+backup=(etc/security/limits.d/10-gcr.conf)
+install=gcr.install
+options=(debug)
+_commit=f5026a8c9c7d78372b3efeca3412b0e40011ce11 # tags/3.41.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd gcr
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gcr
+
+ # Fix build
+ git cherry-pick -n b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8
+}
+
+build() {
+ arch-meson gcr build
+ meson compile -C build
+}
+
+check() {
+ # Secure memory tests fail
+ dbus-run-session meson test -C build --print-errorlogs || :
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+
+ # 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 -Dm644 /dev/stdin "$pkgdir/etc/security/limits.d/10-gcr.conf" <<END
+ at users - memlock 1024
+END
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: gcr.install
===================================================================
--- gcr.install 2022-04-01 18:52:05 UTC (rev 441176)
+++ gcr.install 2022-04-01 18:52:17 UTC (rev 441177)
@@ -1,20 +0,0 @@
-post_install() {
- # Enable socket by default
- systemctl --global enable gcr-ssh-agent.socket
-
- cat <<END
->>> gcr contains /etc/security/limits.d/10-gcr.conf which sets the memlock limit
- in order to allow GCR to lock private keys in memory. If you have configured
- this limit differently before, please review your configuration.
-END
-}
-
-post_upgrade() {
- if (( $(vercmp $2 3.41.0-1) < 0)); then
- systemctl --global enable gcr-ssh-agent.socket
- fi
-}
-
-pre_remove() {
- systemctl --global disable gcr-ssh-agent.socket
-}
Copied: gcr/repos/extra-x86_64/gcr.install (from rev 441176, gcr/trunk/gcr.install)
===================================================================
--- gcr.install (rev 0)
+++ gcr.install 2022-04-01 18:52:17 UTC (rev 441177)
@@ -0,0 +1,20 @@
+post_install() {
+ # Enable socket by default
+ systemctl --global enable gcr-ssh-agent.socket
+
+ cat <<END
+>>> gcr contains /etc/security/limits.d/10-gcr.conf which sets the memlock limit
+ in order to allow GCR to lock private keys in memory. If you have configured
+ this limit differently before, please review your configuration.
+END
+}
+
+post_upgrade() {
+ if (( $(vercmp $2 3.41.0-1) < 0)); then
+ systemctl --global enable gcr-ssh-agent.socket
+ fi
+}
+
+pre_remove() {
+ systemctl --global disable gcr-ssh-agent.socket
+}
More information about the arch-commits
mailing list