[arch-commits] Commit in keyutils/repos (6 files)
Jelle van der Waa
jelle at archlinux.org
Thu Nov 21 15:40:56 UTC 2019
Date: Thursday, November 21, 2019 @ 15:40:56
Author: jelle
Revision: 369561
db-move: moved keyutils from [testing] to [core] (x86_64)
Added:
keyutils/repos/core-x86_64/PKGBUILD
(from rev 369560, keyutils/repos/testing-x86_64/PKGBUILD)
keyutils/repos/core-x86_64/reproducible.patch
(from rev 369560, keyutils/repos/testing-x86_64/reproducible.patch)
keyutils/repos/core-x86_64/request-key.conf.patch
(from rev 369560, keyutils/repos/testing-x86_64/request-key.conf.patch)
Deleted:
keyutils/repos/core-x86_64/PKGBUILD
keyutils/repos/core-x86_64/request-key.conf.patch
keyutils/repos/testing-x86_64/
------------------------------------+
/PKGBUILD | 38 +++++++++++++++++++++++++++++++++++
/request-key.conf.patch | 21 +++++++++++++++++++
core-x86_64/PKGBUILD | 34 -------------------------------
core-x86_64/reproducible.patch | 24 ++++++++++++++++++++++
core-x86_64/request-key.conf.patch | 21 -------------------
5 files changed, 83 insertions(+), 55 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2019-11-21 14:41:25 UTC (rev 369560)
+++ core-x86_64/PKGBUILD 2019-11-21 15:40:56 UTC (rev 369561)
@@ -1,34 +0,0 @@
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=keyutils
-pkgver=1.6.1
-pkgrel=2
-pkgdesc='Linux Key Management Utilities'
-arch=('x86_64')
-url='https://www.kernel.org/'
-license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'sh')
-makedepends=('git')
-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')
-sha256sums=('SKIP'
- '203c602c61ed94ccd423a0a453d74143d678c641a9a4486367576ee8af2cb8d6')
-
-prepare() {
- cd ${pkgname}
- # fix paths of binaries in /etc/request-key.conf
- patch -Np0 -i ../request-key.conf.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/core-x86_64/PKGBUILD (from rev 369560, keyutils/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2019-11-21 15:40:56 UTC (rev 369561)
@@ -0,0 +1,38 @@
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=keyutils
+pkgver=1.6.1
+pkgrel=3
+pkgdesc='Linux Key Management Utilities'
+arch=('x86_64')
+url='https://www.kernel.org/'
+license=('GPL2' 'LGPL2.1')
+depends=('glibc' 'sh')
+makedepends=('git')
+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/core-x86_64/reproducible.patch (from rev 369560, keyutils/repos/testing-x86_64/reproducible.patch)
===================================================================
--- core-x86_64/reproducible.patch (rev 0)
+++ core-x86_64/reproducible.patch 2019-11-21 15:40:56 UTC (rev 369561)
@@ -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: core-x86_64/request-key.conf.patch
===================================================================
--- core-x86_64/request-key.conf.patch 2019-11-21 14:41:25 UTC (rev 369560)
+++ core-x86_64/request-key.conf.patch 2019-11-21 15:40:56 UTC (rev 369561)
@@ -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/core-x86_64/request-key.conf.patch (from rev 369560, keyutils/repos/testing-x86_64/request-key.conf.patch)
===================================================================
--- core-x86_64/request-key.conf.patch (rev 0)
+++ core-x86_64/request-key.conf.patch 2019-11-21 15:40:56 UTC (rev 369561)
@@ -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