summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2021-12-15 01:56:08 -0700
committerBrian Bidulock2021-12-15 01:56:08 -0700
commitd1aaff651af85960bb6c6e0d98eb790a26bc7386 (patch)
treeb48fe320f2fea8e1044f3fe2f29765675bee5480
parent985005bdddbe1332c41511803d03b6ddb497ff40 (diff)
downloadaur-gcr-nogtk.tar.gz
uppkg
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD64
-rw-r--r--gcr.install9
3 files changed, 58 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 699404581d16..9d916b8b76de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,30 @@
-# Generated by mksrcinfo v8
-# Mon Oct 10 20:56:54 UTC 2016
pkgbase = gcr-nogtk
pkgdesc = A library for bits of crypto UI and parsing (without GTK)
- pkgver = 3.20.0
- pkgrel = 2
- url = https://git.gnome.org/browse/gcr
- arch = i686
+ pkgver = 3.41.0
+ pkgrel = 1
+ url = https://gitlab.gnome.org/GNOME/gcr
+ install = gcr.install
arch = x86_64
+ arch = i686
license = GPL2
- makedepends = intltool
makedepends = gobject-introspection
- makedepends = python
makedepends = vala
makedepends = libxslt
+ makedepends = git
+ makedepends = gtk-doc
+ makedepends = meson
depends = dconf
depends = libgcrypt
depends = p11-kit
- provides = gcr
+ depends = openssh
+ depends = libsecret
+ provides = libgck-1.so
+ provides = libgcr-base-3.so
+ provides = libgcr-ui-3.so
+ provides = gcr=3.41.0-1
conflicts = gcr
- options = !makeflags
- source = http://download.gnome.org/sources/gcr/3.20/gcr-3.20.0.tar.xz
- source = 10-gcr.conf
- sha256sums = 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379
- sha256sums = 5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc
+ backup = etc/security/limits.d/10-gcr.conf
+ source = git+https://gitlab.gnome.org/GNOME/gcr.git#commit=f5026a8c9c7d78372b3efeca3412b0e40011ce11
+ sha256sums = SKIP
pkgname = gcr-nogtk
-
diff --git a/PKGBUILD b/PKGBUILD
index 9dd93af44607..2d5b676bbd54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,53 @@
-# $Id: PKGBUILD 272552 2016-07-28 08:50:18Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+_pkgname=gcr
pkgname=gcr-nogtk
-pkgver=3.20.0
-pkgrel=2
+pkgver=3.41.0
+pkgrel=1
pkgdesc="A library for bits of crypto UI and parsing (without GTK)"
-arch=(i686 x86_64)
-url="https://git.gnome.org/browse/gcr"
-license=('GPL2')
-depends=('dconf' 'libgcrypt' 'p11-kit')
-makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt')
-options=('!makeflags')
-source=(http://download.gnome.org/sources/gcr/${pkgver:0:4}/gcr-$pkgver.tar.xz
- 10-gcr.conf)
-sha256sums=('90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379'
- '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
-provides=(gcr)
-conflicts=(gcr)
+url="https://gitlab.gnome.org/GNOME/gcr"
+arch=(x86_64 i686)
+license=(GPL2)
+depends=(dconf libgcrypt p11-kit openssh libsecret)
+makedepends=(gobject-introspection vala libxslt git gtk-doc meson)
+provides=(libgck-1.so libgcr-{base,ui}-3.so ${_pkgname}=${pkgver}-${pkgrel})
+_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')
+conflicts=(${_pkgname})
+
+pkgver() {
+ cd $_pkgname
+ git describe --tags | sed 's/-/+/g'
+}
prepare() {
- mkdir -p path
- ln -f -s /usr/bin/python2 path/python
+ cd $_pkgname
}
build() {
- cd "gcr-$pkgver"
- ./configure --prefix=/usr \
- --libexec=/usr/lib/gcr \
- --disable-static \
- --disable-update-mime \
- --disable-schemas-compile \
- --without-gtk
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ arch-meson -D gtk=false -D gtk_doc=false $_pkgname build
+ meson compile -C build
}
check() {
- cd "gcr-$pkgver"
- PATH="$srcdir/path:$PATH" dbus-run-session make -k check || :
+ # Secure memory tests fail
+ dbus-run-session meson test -C build --print-errorlogs || :
}
package() {
- cd "gcr-$pkgver"
- make DESTDIR="$pkgdir" install
+ 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 ../10-gcr.conf "$pkgdir/etc/security/limits.d/10-gcr.conf"
+ install -Dm644 /dev/stdin "$pkgdir/etc/security/limits.d/10-gcr.conf" <<END
+@users - memlock 1024
+END
}
# vim:set ts=2 sw=2 et:
diff --git a/gcr.install b/gcr.install
new file mode 100644
index 000000000000..ce876d28ba11
--- /dev/null
+++ b/gcr.install
@@ -0,0 +1,9 @@
+post_install() {
+ 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
+}
+
+# vim:set ft=bash sw=2: