upg cryptsetup util-linux
This commit is contained in:
parent
cce3d140bc
commit
2b83f6a57b
6 changed files with 56 additions and 30 deletions
|
|
@ -7,12 +7,19 @@
|
|||
|
||||
pkgname=cryptsetup
|
||||
pkgver=2.7.5
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt w/o systemd'
|
||||
url='https://gitlab.com/cryptsetup/cryptsetup/'
|
||||
depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so')
|
||||
## 2.7.5-1 >
|
||||
#depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
# 'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so')
|
||||
# 2.7.5-2 >
|
||||
depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
'libcrypto.so' 'glibc'
|
||||
'libuuid.so' 'json-c' 'libjson-c.so'
|
||||
'libblkid.so')
|
||||
makedepends=(util-linux asciidoctor)
|
||||
checkdepends=('jq' 'procps-ng' 'xxd') # added on 2.7.5-2
|
||||
#options=('debug' '!emptydirs')
|
||||
conflicts=('mkinitcpio<38-1')
|
||||
provides=('libcryptsetup.so')
|
||||
|
|
@ -25,17 +32,24 @@ source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgna
|
|||
|
||||
build() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
# 2.7.5-1 --enable-libargon2 \
|
||||
# 2.7.5-2 argon2 gone -> argone?
|
||||
# argon2 A password-hashing function (reference C implementation)
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sbindir=/usr/bin \
|
||||
--enable-libargon2 \
|
||||
--disable-ssh-token \
|
||||
--disable-static
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
|
||||
|
|
@ -54,12 +68,12 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL')
|
||||
license=('GPL-2.0-or-later')
|
||||
|
||||
validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com>
|
||||
|
||||
sha256sums=(d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522 # cryptsetup-2.7.5.tar.xz
|
||||
5748d07e9cd81cb0d67e9b496bf915539e17e5b0f620c016e68fd15ed8d49288) # cryptsetup-2.7.5.tar.sign
|
||||
|
||||
## 3a43f66f68db6448d981f0fabc7c56a48f7c682c371b569e61bf5a45836a580c cryptsetup-2.7.5-01-x86_64.pkg.tar.lz
|
||||
## da7ae9356eae209a63eca0adc421191a5bfa18249457a97b6a8ea9f8c39ef35d cryptsetup-2.7.5-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,19 @@
|
|||
|
||||
pkgname=cryptsetup
|
||||
pkgver=2.7.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
|
||||
arch=(x86_64)
|
||||
license=('GPL')
|
||||
arch=('x86_64')
|
||||
license=('GPL-2.0-or-later')
|
||||
url='https://gitlab.com/cryptsetup/cryptsetup/'
|
||||
depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so')
|
||||
depends=('device-mapper' 'libdevmapper.so'
|
||||
'glibc'
|
||||
'openssl' 'libcrypto.so'
|
||||
'popt'
|
||||
'util-linux-libs' 'libblkid.so' 'libuuid.so'
|
||||
'json-c' 'libjson-c.so')
|
||||
makedepends=('util-linux' 'asciidoctor')
|
||||
checkdepends=('jq' 'procps-ng' 'xxd')
|
||||
conflicts=('mkinitcpio<38-1')
|
||||
provides=('libcryptsetup.so')
|
||||
options=('!emptydirs')
|
||||
|
|
@ -25,13 +30,17 @@ build() {
|
|||
./configure \
|
||||
--prefix=/usr \
|
||||
--sbindir=/usr/bin \
|
||||
--enable-libargon2 \
|
||||
--disable-ssh-token \
|
||||
--disable-static
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
asciidoctor
|
||||
device-mapper
|
||||
popt
|
||||
argon2
|
||||
asciidoctor
|
||||
|
||||
|
||||
jq
|
||||
gvim
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
real 0m16.367s
|
||||
user 0m35.165s
|
||||
sys 0m3.029s
|
||||
|
||||
|
||||
real 3m27.151s
|
||||
user 2m38.286s
|
||||
sys 1m4.302s
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
|
||||
pkgbase=util-linux
|
||||
pkgname=(util-linux util-linux-libs)
|
||||
_tag='2.40.3'
|
||||
pkgver="${_tag/-/}"
|
||||
pkgrel=01
|
||||
pkgver=2.40.3
|
||||
pkgrel=02
|
||||
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
|
||||
url='https://github.com/util-linux/util-linux'
|
||||
#url='https://github.com/util-linux/util-linux'
|
||||
|
|
@ -27,15 +26,15 @@ options=('strip')
|
|||
# source=("git+https://github.com/karelzak/util-linux#tag=${_tag}?signed"
|
||||
# yet again in a month three sources for the same software ... lead by a man with a redhat account.
|
||||
# need we say more for the puppets in kernel.org?
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed"
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=v${pkgver/rc/-rc}?signed"
|
||||
$pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
|
||||
pam-{login,common,remote,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
'60-rfkill.rules')
|
||||
|
||||
_backports=(
|
||||
# # current stable/v2.40
|
||||
# "v${_tag}..175af5cb8e0434bbc6660f7ccbea3a188d8f2d72"
|
||||
# build-sys: release++ (v2.40.4)
|
||||
"v${pkgver}..dbcc687f6ab1568982cdf3fe391c0beb818b7e28"
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
|
|
@ -203,6 +202,6 @@ sha256sums=(47f46d24d67f42a7a1e2ae1ff8f4175307426cfcd70c544484ec5a235a77311f #
|
|||
b3d8994c0ab0c50500ed249c90fb709555a369b910e5f3eca758a28d4e73e2d3 # util-linux.sysusers
|
||||
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
|
||||
|
||||
## 0c2b4029453276e3365eefbef6560a5ea5026fb80eb088f74be0e7ae0abb8c5e util-linux-2.40.3-01-x86_64.pkg.tar.lz
|
||||
## c0a8930cfd34da2dd6da5bb11f14866f1e12acb62cadcb2b0c321704aeab85a6 util-linux-libs-2.40.3-01-x86_64.pkg.tar.lz
|
||||
## e540a842e00ea0dd7df8f7a3e19dca6378b5400ad510eac7359f2e89f3d3b70c util-linux-2.40.3-02-x86_64.pkg.tar.lz
|
||||
## efdfcc25f9b369e4d188d06b86fbff229df295e9e441ff8cb7be20fbeb1bfa2a util-linux-libs-2.40.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,8 @@
|
|||
|
||||
pkgbase=util-linux
|
||||
pkgname=(util-linux util-linux-libs)
|
||||
_tag='2.40.3'
|
||||
pkgver="${_tag/-/}"
|
||||
pkgrel=1
|
||||
pkgver='2.40.3'
|
||||
pkgrel=2
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/util-linux/util-linux'
|
||||
arch=('x86_64')
|
||||
|
|
@ -40,7 +39,7 @@ license=(
|
|||
)
|
||||
options=('strip')
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed"
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=v${pkgver/rc/-rc}?signed"
|
||||
$pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
|
||||
pam-{login,common,remote,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
|
|
@ -60,6 +59,8 @@ sha256sums=('47f46d24d67f42a7a1e2ae1ff8f4175307426cfcd70c544484ec5a235a77311f'
|
|||
'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
|
||||
|
||||
_backports=(
|
||||
# build-sys: release++ (v2.40.4)
|
||||
"v${pkgver}..dbcc687f6ab1568982cdf3fe391c0beb818b7e28"
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
|
|
|
|||
Loading…
Reference in a new issue