diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-07-31 11:53:28 +0200 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-07-31 11:53:28 +0200 |
| commit | 4ae5da0a3690cf0417529083bd571b77735b0eee (patch) | |
| tree | 76c90527abe75308eb472410190921df9befd6cf /cryptsetup | |
| parent | 202e0f17c17ec8fdc4ef245a0265decef5597c9e (diff) | |
| parent | 4d14762266ad57c742731c1038b639ec2c8ff6bc (diff) | |
| download | opt-4ae5da0a3690cf0417529083bd571b77735b0eee.tar.gz opt-4ae5da0a3690cf0417529083bd571b77735b0eee.tar.xz | |
Merge remote-tracking branch 'origin/3.6' into 3.7
Diffstat (limited to 'cryptsetup')
| -rw-r--r-- | cryptsetup/.footprint | 41 | ||||
| -rw-r--r-- | cryptsetup/.signature | 8 | ||||
| -rw-r--r-- | cryptsetup/Pkgfile | 6 |
3 files changed, 44 insertions, 11 deletions
diff --git a/cryptsetup/.footprint b/cryptsetup/.footprint index 87679bac2..344ec65b9 100644 --- a/cryptsetup/.footprint +++ b/cryptsetup/.footprint @@ -7,15 +7,13 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cryptsetup/ -rw-r--r-- root/root usr/lib/libcryptsetup.a -rwxr-xr-x root/root usr/lib/libcryptsetup.la -lrwxrwxrwx root/root usr/lib/libcryptsetup.so -> libcryptsetup.so.12.7.0 -lrwxrwxrwx root/root usr/lib/libcryptsetup.so.12 -> libcryptsetup.so.12.7.0 --rwxr-xr-x root/root usr/lib/libcryptsetup.so.12.7.0 +lrwxrwxrwx root/root usr/lib/libcryptsetup.so -> libcryptsetup.so.12.8.0 +lrwxrwxrwx root/root usr/lib/libcryptsetup.so.12 -> libcryptsetup.so.12.8.0 +-rwxr-xr-x root/root usr/lib/libcryptsetup.so.12.8.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcryptsetup.pc drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/cryptsetup --rwxr-xr-x root/root usr/sbin/cryptsetup-reencrypt --rwxr-xr-x root/root usr/sbin/cryptsetup-reencrypt.static -rwxr-xr-x root/root usr/sbin/integritysetup -rwxr-xr-x root/root usr/sbin/integritysetup.static -rwxr-xr-x root/root usr/sbin/veritysetup @@ -23,7 +21,40 @@ drwxr-xr-x root/root usr/sbin/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-benchmark.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-bitlkDump.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-bitlkOpen.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-close.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-config.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-convert.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-create.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-erase.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-isLuks.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-loopaesOpen.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksAddKey.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksChangeKey.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksConvertKey.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksDump.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksErase.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksFormat.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksHeaderBackup.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksHeaderRestore.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksKillSlot.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksOpen.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksRemoveKey.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksResume.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksSuspend.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-luksUUID.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-open.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-plainOpen.8.gz -rw-r--r-- root/root usr/share/man/man8/cryptsetup-reencrypt.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-refresh.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-repair.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-resize.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-status.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-tcryptDump.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-tcryptOpen.8.gz +-rw-r--r-- root/root usr/share/man/man8/cryptsetup-token.8.gz -rw-r--r-- root/root usr/share/man/man8/cryptsetup.8.gz -rw-r--r-- root/root usr/share/man/man8/integritysetup.8.gz -rw-r--r-- root/root usr/share/man/man8/veritysetup.8.gz diff --git a/cryptsetup/.signature b/cryptsetup/.signature index 63ac335d0..f0a78e714 100644 --- a/cryptsetup/.signature +++ b/cryptsetup/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VOB4CVe3ExBYEDhzTDtrn5hOYeWOAMRkdJX5t9da0JWPm9o3n3lZgtFC2MpPOnMyKmcjlyYwxSbT+11Dn7HcQI= -SHA256 (Pkgfile) = c4a0df5b5ac56786a586735ace6427689670f3e68f41b4b94bb37fa222f82303 -SHA256 (.footprint) = f2831be96e5aa30aeb46629dfc28962442381a68c4badefb8e9ef5b06cc0702a -SHA256 (cryptsetup-2.4.3.tar.xz) = fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 +RWSE3ohX2g5d/fxX/EP4raiXzDa1CVkrUV8rwI3/U5gFUad6IJmKkr21fWWDNGauPR6pP7CV4sA3yL6FjxPqCd3vP6+zI1iA+As= +SHA256 (Pkgfile) = bf4c38efb7c334271cd49c871eafb814fbe708c5a1cdbb08a5ae39339cca0fc3 +SHA256 (.footprint) = 6f32c69efd3a246fe7b2fafa6232f171b317ffd30e6410a0302a79776978a328 +SHA256 (cryptsetup-2.5.0.tar.xz) = 9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 diff --git a/cryptsetup/Pkgfile b/cryptsetup/Pkgfile index ddb6d0a01..9c1bdb30b 100644 --- a/cryptsetup/Pkgfile +++ b/cryptsetup/Pkgfile @@ -4,14 +4,16 @@ # Depends on: json-c libdevmapper openssl popt name=cryptsetup -version=2.4.3 +version=2.5.0 release=1 source=(https://www.kernel.org/pub/linux/utils/$name/v${version%.*}/$name-$version.tar.xz) build() { cd $name-$version - ./configure \ + prt-get isinst asciidoc || PKGMK_CRYPTSETUP+=' --disable-asciidoc' + + ./configure $PKGMK_CRYPTSETUP \ --prefix=/usr \ --disable-nls \ --enable-static-cryptsetup \ |