[arch-commits] Commit in keyutils/repos/testing-x86_64 (6 files)
Christian Hesse
eworm at archlinux.org
Tue Jul 7 21:19:44 UTC 2020
Date: Tuesday, July 7, 2020 @ 21:19:44
Author: eworm
Revision: 391004
archrelease: copy trunk to testing-x86_64
Added:
keyutils/repos/testing-x86_64/PKGBUILD
(from rev 391003, keyutils/trunk/PKGBUILD)
keyutils/repos/testing-x86_64/reproducible.patch
(from rev 391003, keyutils/trunk/reproducible.patch)
keyutils/repos/testing-x86_64/request-key.conf.patch
(from rev 391003, keyutils/trunk/request-key.conf.patch)
Deleted:
keyutils/repos/testing-x86_64/PKGBUILD
keyutils/repos/testing-x86_64/reproducible.patch
keyutils/repos/testing-x86_64/request-key.conf.patch
------------------------+
PKGBUILD | 79 +++++++++++++++++++++++------------------------
reproducible.patch | 48 ++++++++++++++--------------
request-key.conf.patch | 42 ++++++++++++------------
3 files changed, 85 insertions(+), 84 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-07 21:19:36 UTC (rev 391003)
+++ PKGBUILD 2020-07-07 21:19:44 UTC (rev 391004)
@@ -1,39 +0,0 @@
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=keyutils
-pkgver=1.6.2
-pkgrel=1
-pkgdesc='Linux Key Management Utilities'
-arch=('x86_64')
-url='https://www.kernel.org/'
-license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'sh')
-makedepends=('git')
-provides=('libkeyutils.so')
-backup=('etc/request-key.conf')
-validpgpkeys=('A86E54B0D5E1B4E0AB7C640FFBB7576BA7CB0B6B') # David Howells <dhowells at redhat.com>
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git#tag=v${pkgver}?signed"
- 'request-key.conf.patch' 'reproducible.patch')
-sha256sums=('SKIP'
- '203c602c61ed94ccd423a0a453d74143d678c641a9a4486367576ee8af2cb8d6'
- '7bb7400b2b8c8f0288c86ec9191f8964a1e682745a204013d5fc7c2e1a253d8e')
-
-prepare() {
- cd ${pkgname}
- # fix paths of binaries in /etc/request-key.conf
- patch -Np0 -i ../request-key.conf.patch
-
- # make keyutils reproducible
- patch -Np1 -i ../reproducible.patch
-}
-
-build() {
- cd ${pkgname}
- make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin'
-}
-
-package() {
- cd ${pkgname}
- make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install
-}
Copied: keyutils/repos/testing-x86_64/PKGBUILD (from rev 391003, keyutils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-07 21:19:44 UTC (rev 391004)
@@ -0,0 +1,40 @@
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=keyutils
+_tag='5678a1aae8834b5c16b5ed7dc72ef8836a29e122' # git rev-parse v${pkgver}
+pkgver=1.6.3
+pkgrel=1
+pkgdesc='Linux Key Management Utilities'
+arch=('x86_64')
+url='https://www.kernel.org/'
+license=('GPL2' 'LGPL2.1')
+depends=('glibc' 'sh')
+makedepends=('git')
+provides=('libkeyutils.so')
+backup=('etc/request-key.conf')
+validpgpkeys=('A86E54B0D5E1B4E0AB7C640FFBB7576BA7CB0B6B') # David Howells <dhowells at redhat.com>
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git#tag=${_tag}?signed"
+ 'request-key.conf.patch' 'reproducible.patch')
+sha256sums=('SKIP'
+ '203c602c61ed94ccd423a0a453d74143d678c641a9a4486367576ee8af2cb8d6'
+ '7bb7400b2b8c8f0288c86ec9191f8964a1e682745a204013d5fc7c2e1a253d8e')
+
+prepare() {
+ cd ${pkgname}
+ # fix paths of binaries in /etc/request-key.conf
+ patch -Np0 -i ../request-key.conf.patch
+
+ # make keyutils reproducible
+ patch -Np1 -i ../reproducible.patch
+}
+
+build() {
+ cd ${pkgname}
+ make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin'
+}
+
+package() {
+ cd ${pkgname}
+ make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install
+}
Deleted: reproducible.patch
===================================================================
--- reproducible.patch 2020-07-07 21:19:36 UTC (rev 391003)
+++ reproducible.patch 2020-07-07 21:19:44 UTC (rev 391004)
@@ -1,24 +0,0 @@
-Adhere to the SOURCE_DATE_EPOCH standard and use it's date when set
-otherwise fall back to the default behaviour.
-
-Signed-off-by: Jelle van der Waa <jelle at vdwaa.nl>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 33a451e..9066d5d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -108,7 +108,7 @@ all: keyctl request-key key.dns_resolver
- ###############################################################################
- #RPATH = -Wl,-rpath,$(LIBDIR)
-
--VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""
-+VCPPFLAGS := -DPKGBUILD="\"$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%F)\""
- VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\""
- VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""
-
---
-2.21.0
-
Copied: keyutils/repos/testing-x86_64/reproducible.patch (from rev 391003, keyutils/trunk/reproducible.patch)
===================================================================
--- reproducible.patch (rev 0)
+++ reproducible.patch 2020-07-07 21:19:44 UTC (rev 391004)
@@ -0,0 +1,24 @@
+Adhere to the SOURCE_DATE_EPOCH standard and use it's date when set
+otherwise fall back to the default behaviour.
+
+Signed-off-by: Jelle van der Waa <jelle at vdwaa.nl>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 33a451e..9066d5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -108,7 +108,7 @@ all: keyctl request-key key.dns_resolver
+ ###############################################################################
+ #RPATH = -Wl,-rpath,$(LIBDIR)
+
+-VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""
++VCPPFLAGS := -DPKGBUILD="\"$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%F)\""
+ VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\""
+ VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""
+
+--
+2.21.0
+
Deleted: request-key.conf.patch
===================================================================
--- request-key.conf.patch 2020-07-07 21:19:36 UTC (rev 391003)
+++ request-key.conf.patch 2020-07-07 21:19:44 UTC (rev 391004)
@@ -1,21 +0,0 @@
---- request-key.conf.old 2013-05-28 15:34:10.966001242 +0200
-+++ request-key.conf 2013-05-28 15:35:34.857969598 +0200
-@@ -31,11 +31,11 @@
-
- #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ...
- #====== ======= =============== =============== ===============================
--create dns_resolver * * /sbin/key.dns_resolver %k
--create user debug:* negate /bin/keyctl negate %k 30 %S
--create user debug:* rejected /bin/keyctl reject %k 30 %c %S
--create user debug:* expired /bin/keyctl reject %k 30 %c %S
--create user debug:* revoked /bin/keyctl reject %k 30 %c %S
--create user debug:loop:* * |/bin/cat
-+create dns_resolver * * /usr/bin/key.dns_resolver %k
-+create user debug:* negate /usr/bin/keyctl negate %k 30 %S
-+create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S
-+create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S
-+create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S
-+create user debug:loop:* * |/usr/bin/cat
- create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
--negate * * * /bin/keyctl negate %k 30 %S
-+negate * * * /usr/bin/keyctl negate %k 30 %S
Copied: keyutils/repos/testing-x86_64/request-key.conf.patch (from rev 391003, keyutils/trunk/request-key.conf.patch)
===================================================================
--- request-key.conf.patch (rev 0)
+++ request-key.conf.patch 2020-07-07 21:19:44 UTC (rev 391004)
@@ -0,0 +1,21 @@
+--- request-key.conf.old 2013-05-28 15:34:10.966001242 +0200
++++ request-key.conf 2013-05-28 15:35:34.857969598 +0200
+@@ -31,11 +31,11 @@
+
+ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ...
+ #====== ======= =============== =============== ===============================
+-create dns_resolver * * /sbin/key.dns_resolver %k
+-create user debug:* negate /bin/keyctl negate %k 30 %S
+-create user debug:* rejected /bin/keyctl reject %k 30 %c %S
+-create user debug:* expired /bin/keyctl reject %k 30 %c %S
+-create user debug:* revoked /bin/keyctl reject %k 30 %c %S
+-create user debug:loop:* * |/bin/cat
++create dns_resolver * * /usr/bin/key.dns_resolver %k
++create user debug:* negate /usr/bin/keyctl negate %k 30 %S
++create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S
++create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S
++create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S
++create user debug:loop:* * |/usr/bin/cat
+ create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
+-negate * * * /bin/keyctl negate %k 30 %S
++negate * * * /usr/bin/keyctl negate %k 30 %S
More information about the arch-commits
mailing list