[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-11-16 Thread Jonas Witschel via arch-commits
Date: Monday, November 16, 2020 @ 19:05:58
  Author: diabonas
Revision: 755527

upgpkg: clevis 15-2: add support for tpm2-tools 5.0

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-16 19:05:22 UTC (rev 755526)
+++ PKGBUILD2020-11-16 19:05:58 UTC (rev 755527)
@@ -1,8 +1,8 @@
 # Maintainer: Jonas Witschel 
 pkgname=clevis
 pkgver=15
-_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # signed commit corresponding 
to tag "v$pkgver"
-pkgrel=1
+_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # git rev-parse "v$pkgver^{}"
+pkgrel=2
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')
 url='https://github.com/latchset/clevis'
@@ -32,6 +32,12 @@
git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+   cd "$pkgname"
+   # Add support for tpm2-tools 5.0
+   git cherry-pick --no-commit ef76951e4486dadf41ca8085e09849466a0c7fd3
+}
+
 build() {
cd "$pkgname"
meson --prefix=/usr --libexecdir=/usr/lib --buildtype=plain build


[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-10-28 Thread Jonas Witschel via arch-commits
Date: Wednesday, October 28, 2020 @ 20:35:10
  Author: diabonas
Revision: 735704

upgpkg: clevis 15-1: upstream release

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-28 20:35:08 UTC (rev 735703)
+++ PKGBUILD2020-10-28 20:35:10 UTC (rev 735704)
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel 
 pkgname=clevis
-pkgver=14
-_commit=44b7b6ef3b1bdce67fff737daa72b25671f4ce2c # signed commit corresponding 
to tag "v$pkgver"
+pkgver=15
+_commit=6add2e9acbed9b4bcb50dcc60d4c72733bd65d14 # signed commit corresponding 
to tag "v$pkgver"
 pkgrel=1
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')


[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-08-31 Thread Jonas Witschel via arch-commits
Date: Monday, August 31, 2020 @ 14:34:19
  Author: diabonas
Revision: 694205

upgpkg: clevis 14-1: upstream release

The fakeroot workaround to get better test coverage does not appear to work any
more, tests fail with errors like

cp: error writing '/tmp/tmp.XX/luks1.cached': No space left on device

(completely unrelated to the actual funtionality to be tested), so drop
fakeroot.

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-31 14:31:57 UTC (rev 694204)
+++ PKGBUILD2020-08-31 14:34:19 UTC (rev 694205)
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel 
 pkgname=clevis
-pkgver=13
-_commit=0bea5c4f6594a4611498cfbcfe123ed3e092b1e5 # signed commit corresponding 
to tag "v$pkgver"
+pkgver=14
+_commit=44b7b6ef3b1bdce67fff737daa72b25671f4ce2c # signed commit corresponding 
to tag "v$pkgver"
 pkgrel=1
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')
@@ -9,7 +9,7 @@
 license=('GPL3')
 depends=('bash' 'jose')
 makedepends=('git' 'meson' 'asciidoc' 'audit' 'bash-completion' 'cryptsetup' 
'dracut' 'glib2'
- 'libpwquality' 'luksmeta' 'openssl' 'tpm2-tools' 'udisks2')
+ 'jansson' 'libpwquality' 'luksmeta' 'openssl' 'tpm2-tools' 
'udisks2')
 checkdepends=('jq' 'tang')
 optdepends=('audit: UDisks2 unlocker support'
 'cryptsetup: LUKS unlocker support'
@@ -40,9 +40,7 @@
 
 check() {
cd "$pkgname"
-   # The LUKS tests are skipped when not running as root but work fine 
without
-   # actual root privileges, so use fakeroot to bypass the root check
-   fakeroot ninja -C build test
+   ninja -C build test
 }
 
 package() {


[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-05-10 Thread Jonas Witschel via arch-commits
Date: Sunday, May 10, 2020 @ 14:25:30
  Author: diabonas
Revision: 626175

upgpkg: clevis 13-1: upstream release

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-10 13:22:28 UTC (rev 626174)
+++ PKGBUILD2020-05-10 14:25:30 UTC (rev 626175)
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel 
 pkgname=clevis
-_commit=dabff02d76e3c6b55240ff8a6044fa0d09101c7f # signed commit corresponding 
to tag "v$pkgver"
-pkgver=12
+pkgver=13
+_commit=0bea5c4f6594a4611498cfbcfe123ed3e092b1e5 # signed commit corresponding 
to tag "v$pkgver"
 pkgrel=1
 pkgdesc='Automated Encryption Framework'
 arch=('x86_64')
@@ -8,15 +8,19 @@
 url='https://github.com/latchset/clevis'
 license=('GPL3')
 depends=('bash' 'jose')
-makedepends=('git' 'meson' 'asciidoc' 'bash-completion' 'dracut' 'libpwquality'
- 'luksmeta' 'tpm2-tools' 'udisks2')
-checkdepends=('tang')
-optdepends=('cryptsetup: LUKS unlocker support'
+makedepends=('git' 'meson' 'asciidoc' 'audit' 'bash-completion' 'cryptsetup' 
'dracut' 'glib2'
+ 'libpwquality' 'luksmeta' 'openssl' 'tpm2-tools' 'udisks2')
+checkdepends=('jq' 'tang')
+optdepends=('audit: UDisks2 unlocker support'
+'cryptsetup: LUKS unlocker support'
 'curl: Tang pin support'
 'dracut: dracut unlocker support'
+'glib2: UDisks2 unlocker support'
+'jansson: SSS pin and UDisks2 unlocker support'
 'libpwquality: LUKS unlocker support'
 'luksmeta: LUKS and UDisks2 unlocker support'
 'nmap: dracut unlocker support'
+'openssl: SSS pin support'
 'tpm2-tools: TPM2 pin support'
 'udisks2: UDisks2 unlocker support')
 source=("git+$url.git?signed#commit=$_commit")


[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-02-06 Thread Jonas Witschel via arch-commits
Date: Thursday, February 6, 2020 @ 15:53:04
  Author: diabonas
Revision: 563638

Add pkgver() function

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 5 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-06 14:17:50 UTC (rev 563637)
+++ PKGBUILD2020-02-06 15:53:04 UTC (rev 563638)
@@ -23,6 +23,11 @@
 sha512sums=('SKIP')
 validpgpkeys=('7CE2CB3D2AF59FE1EA22F551D0D219ED1F7E762C') # Sergio Correia 

 
+pkgver() {
+   cd "$pkgname"
+   git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
cd "$pkgname"
meson --prefix=/usr --libexecdir=/usr/lib --buildtype=plain build


[arch-commits] Commit in clevis/trunk (PKGBUILD)

2020-01-20 Thread Jonas Witschel via arch-commits
Date: Monday, January 20, 2020 @ 14:16:36
  Author: diabonas
Revision: 553216

Use PGP-signed release commit as source

Modified:
  clevis/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-20 13:38:57 UTC (rev 553215)
+++ PKGBUILD2020-01-20 14:16:36 UTC (rev 553216)
@@ -1,5 +1,6 @@
 # Maintainer: Jonas Witschel 
 pkgname=clevis
+_commit=dabff02d76e3c6b55240ff8a6044fa0d09101c7f # signed commit corresponding 
to tag "v$pkgver"
 pkgver=12
 pkgrel=1
 pkgdesc='Automated Encryption Framework'
@@ -7,7 +8,7 @@
 url='https://github.com/latchset/clevis'
 license=('GPL3')
 depends=('bash' 'jose')
-makedepends=('meson' 'asciidoc' 'bash-completion' 'dracut' 'libpwquality'
+makedepends=('git' 'meson' 'asciidoc' 'bash-completion' 'dracut' 'libpwquality'
  'luksmeta' 'tpm2-tools' 'udisks2')
 checkdepends=('tang')
 optdepends=('cryptsetup: LUKS unlocker support'
@@ -18,17 +19,18 @@
 'nmap: dracut unlocker support'
 'tpm2-tools: TPM2 pin support'
 'udisks2: UDisks2 unlocker support')
-source=("$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz")
-sha512sums=('c71144590cf2528d20892d3ef49b2b1ea948286410385b15f6a3eda01539846c7154b6396b78c0ed8a28f3056b4c3f88ff043978e5483b2ac360ee0f156f78e7')
+source=("git+$url.git?signed#commit=$_commit")
+sha512sums=('SKIP')
+validpgpkeys=('7CE2CB3D2AF59FE1EA22F551D0D219ED1F7E762C') # Sergio Correia 

 
 build() {
-   cd "$pkgname-$pkgver"
+   cd "$pkgname"
meson --prefix=/usr --libexecdir=/usr/lib --buildtype=plain build
ninja -C build
 }
 
 check() {
-   cd "$pkgname-$pkgver"
+   cd "$pkgname"
# The LUKS tests are skipped when not running as root but work fine 
without
# actual root privileges, so use fakeroot to bypass the root check
fakeroot ninja -C build test
@@ -35,6 +37,6 @@
 }
 
 package() {
-   cd "$pkgname-$pkgver"
+   cd "$pkgname"
DESTDIR="$pkgdir" ninja -C build install
 }