upg bash gnutls iproute2 iptables json-c
pinentry (AGAIN!)
This commit is contained in:
parent
ef1a581cfb
commit
37198a520b
18 changed files with 387 additions and 128 deletions
|
|
@ -9,7 +9,7 @@ pkgname=bash
|
|||
_basever=5.2
|
||||
_patchlevel=026
|
||||
pkgver=${_basever}.${_patchlevel}
|
||||
pkgrel=03
|
||||
pkgrel=05
|
||||
pkgdesc='The GNU Bourne Again shell'
|
||||
_url='https://www.gnu.org/software/bash/bash.html'
|
||||
url="https://ftp.gnu.org/gnu"
|
||||
|
|
@ -18,6 +18,11 @@ depends=(readline libreadline.so glibc ncurses)
|
|||
optdepends=('bash-completion: for tab completion')
|
||||
provides=('sh')
|
||||
source=($url/$pkgname/bash-$_basever.tar.gz{,.sig}
|
||||
bash-5.2_p15-configure-clang16.patch
|
||||
bash-5.2_p15-random-ub.patch
|
||||
bash-5.2_p21-configure-strtold.patch
|
||||
bash-5.2_p21-wpointer-to-int.patch
|
||||
bash-5.2_p26-memory-leaks.patch
|
||||
dot.bashrc
|
||||
dot.bash_profile
|
||||
dot.bash_logout
|
||||
|
|
@ -40,6 +45,15 @@ prepare() {
|
|||
msg2 "applying patch ${patch}"
|
||||
patch -Np0 -i ../"${patch}"
|
||||
done
|
||||
# add patches from gentoo, fixing various upstream reported issues
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-shells/bash/files
|
||||
patch -Np0 -i ../bash-5.2_p15-configure-clang16.patch
|
||||
patch -Np0 -i ../bash-5.2_p15-random-ub.patch
|
||||
patch -Np0 -i ../bash-5.2_p21-configure-strtold.patch
|
||||
patch -Np0 -i ../bash-5.2_p21-wpointer-to-int.patch
|
||||
patch -Np0 -i ../bash-5.2_p26-memory-leaks.patch
|
||||
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -91,6 +105,11 @@ validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey
|
|||
|
||||
sha256sums=(a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb # bash-5.2.tar.gz
|
||||
8fc93220776ef7ef0c9efaee0250b8e3085b2c95b1a5de2179c19f57710a0d9b # bash-5.2.tar.gz.sig
|
||||
b0ba61c471dc6728f101edc2f1accf1d066fdf6a56011b0265d0344a32900f21 # bash-5.2_p15-configure-clang16.patch
|
||||
d2b81eb19f691f129d3203db0ac6c1db441b8e832fb22fb7a6a30c2e9bd3b868 # bash-5.2_p15-random-ub.patch
|
||||
9038e9942e0d3b234e14bc082672b79875a7fc57a31f862f3194186aef32598c # bash-5.2_p21-configure-strtold.patch
|
||||
77b1796ec4d70de4e838751004ee0b206e1edc719a45b692c6d5a1623ede64b9 # bash-5.2_p21-wpointer-to-int.patch
|
||||
5773374cfe1bdf80bffcad395ba29802fab06d1a66d84798ad65d55c8b65d1ba # bash-5.2_p26-memory-leaks.patch
|
||||
3e22bf86ae6708df7a6bceb88c67a00118275f9c0b5268f453dd388af7c43b53 # dot.bashrc
|
||||
e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2 # dot.bash_profile
|
||||
4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5 # dot.bash_logout
|
||||
|
|
@ -149,5 +168,5 @@ sha256sums=(a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb #
|
|||
96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac # bash52-026
|
||||
f8ebf835ed0e92c03f7c13e706c872d22754508e59d9492997c5bbd2bb84417e) # bash52-026.sig
|
||||
|
||||
## 792fe452040b91d4c941489f1d87581a91b15ca7ccca11dcd5b030b0a7bdeb61 bash-5.2.026-03-x86_64.pkg.tar.lz
|
||||
## 871ac810f62bf525ceab6e1d3c76a9b3e5fd3e0406bf68bb7582572124c7f21b bash-5.2.026-05-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ pkgname=bash
|
|||
_basever=5.2
|
||||
_patchlevel=026
|
||||
pkgver=${_basever}.${_patchlevel}
|
||||
pkgrel=3
|
||||
pkgrel=5
|
||||
pkgdesc='The GNU Bourne Again shell'
|
||||
arch=(x86_64)
|
||||
license=('GPL-3.0-or-later')
|
||||
|
|
@ -19,6 +19,11 @@ optdepends=('bash-completion: for tab completion')
|
|||
provides=('sh')
|
||||
install=bash.install
|
||||
source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
|
||||
bash-5.2_p15-configure-clang16.patch
|
||||
bash-5.2_p15-random-ub.patch
|
||||
bash-5.2_p21-configure-strtold.patch
|
||||
bash-5.2_p21-wpointer-to-int.patch
|
||||
bash-5.2_p26-memory-leaks.patch
|
||||
dot.bashrc
|
||||
dot.bash_profile
|
||||
dot.bash_logout
|
||||
|
|
@ -31,16 +36,84 @@ if [[ $((10#${_patchlevel})) -gt 0 ]]; then
|
|||
source=(${source[@]} https://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p){,.sig})
|
||||
done
|
||||
fi
|
||||
b2sums=('51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9'
|
||||
'SKIP'
|
||||
'5ef332cd2847f46e351e5db6dda79d01d9853f5eda9762deeba0450c2bd400eec549bbb85696777b687f64d0977daac4883d6ce3f1e26cec0d5f73e8ee97f000'
|
||||
'adab09c3f2ce3697e3659e01266120155714b80263bd125808edf556a354291af615540189553b1c32a2d462ac41e28a9df8fb9f7d963a3ca3629d297a46e62d'
|
||||
'83ec6ff756543ee44c18902f2d30dd662a84237b9594a7e0cfc21a1c16fce49e37cf67729b3a17d59cc978cb6675e04457e3b6b0909d94cb234a1dde96f7c9ea'
|
||||
'0c7f5eb5b697abf15c1d17888a973e44d0ead1f095778b41841a6a1937a5b9e7ce5fa6a05e4404504990b0a244fdecfc12ce7c33ee7d67b4c837435e9bfe2b57'
|
||||
'1b9f08054b28fa0e73b7b3d4da2674efd75b3ce11392a078d5072ba8e466f4a9c504892f9a1f2f62e4dc39b22050e68d42bcbae8ebe537df699d0c884c89a0b9'
|
||||
'61cc3b7c9e85ae29b48518a2579896cb037153184a233cb5636d8dce4c2a2fded88624c9d5a986d86fdd4b0d521828b510c7a0d16b3c8b95cfca8d4c0a74da17'
|
||||
'2d53f99e485218ed47f2e40907023645594ac8ffcf00d0569050d54a8f4dabe0a2bdcab515a45b663283c2e6299d805b923ea7b7b789c6a4150c37a98a5b117c'
|
||||
'dbfe5c1aaea94419305c1f8c9b54b94eab515260910f2309360ff702a27032faa34514e70b31adbb1e41bd912d4e43a610939cb07565f43e05dd19813a81752e'
|
||||
'e349dba4f9d8b9d5eceb928b6fad89bfd2ec052fbb4dece49ba7c012a7e930196f786115e39e11c4f2d59edd169c9d417e7eab4fd59667ed60b750901df55ac3'
|
||||
'fc924345d5dab10f1ae328bca3cf1053ddff557e074a6e6dff771bd813b93838980ed5d0f20d3a0584cbd1994332fcacc8a6b0e98f7aa376139198ea6a4d6f5a'
|
||||
'd00a8b4fb3babf52c67a3e345158c1f70b5b45e5a54100a6671d96f9cfbf893143d5a23df7e7c5f4d5c0bd650519fb0c447b2304db2d6e0751dfffa651a7cf49'
|
||||
'SKIP'
|
||||
'b3b7e2511823a0527aeed5af2c8d9f44e5ab079fa8b3f48fe84b35a14327d0143e14e04316c16bfbe2a1cac0c7fcf7ab5058a2b00be38ed3243b53b786e969f1'
|
||||
'SKIP'
|
||||
'd9f358c240d998a331d6aa4513b02191b1fbe7e875f8e96e531fca8968f84d0f4672d3644bbd6258f2aca0cabd2deb6159bbf98ba201e667d61353113a3e8240'
|
||||
'SKIP'
|
||||
'159fbb7a6dddece1d4db2b38d6de591366ae07eb237ffa8ad61c933560160561736a4e70b8bd5441cd75ae88e8d4a29869367838b169a4533d06d9d3c345d554'
|
||||
'SKIP'
|
||||
'5afdbe8fa644e1b7108600a7ecc0a8e5774a837f3acff45bfe5eff9ffca1b9e5ab09f19083464a9cfaee4bd6c9b351275c5baef5331c43dbfbc642e226ca8af3'
|
||||
'SKIP'
|
||||
'68c37f5f5164685d0d1f25a05d5584128b6d8d83efa271aaaf80c82e2ec71bc78a3961ebd5d5d6620ef6a3dcca7e6494f0e666b651056faef9c0ea0866b3b94e'
|
||||
'SKIP'
|
||||
'028808fa9eac85e66ad942fff07ca6595b578911b3f3f99ae7d67289bd6c27936bbce66fea160e8c3e2fcc6bb18f6429121685c550a815ed992f9d0c757391ae'
|
||||
'SKIP'
|
||||
'b46dde58525b727565efeca99cf4279fd2510382430b227ed233e7fc78c433b8d7eb2f1f7e4d31174118e9cc5bb8c43656e78583dc7fde15381aa63001b78277'
|
||||
'SKIP'
|
||||
'36a1a5be9166f436077aff8c8dc8e6b8745b6b07408e5abc3756846d199799cee22e825ae992f3db5f3885157fb37b64f1159b3bc8d0bd1d16c5980c9f74e092'
|
||||
'SKIP'
|
||||
'0c61991d38c95b25411e793a09855c18f536ddfae237b09d01ac7898d4638b8747fc58d2c2f35c651026bd6957cb04780382256417e0bbde288aa4e05cd80530'
|
||||
'SKIP'
|
||||
'e1b246634ee7b1bba7e4b140bc730fa6770f5988ed215ea1ba646eea630789b863333fec471e99c28b142b74539639f37239487b02b877ea360f519bdaee2894'
|
||||
'SKIP'
|
||||
'b7c4888a3af4e9ee37f3d83d15bad1360209eb412ba1e963c4be90b0b1d62e0c860f61f5cf7de3b7b1a34d341101069ffa5a65efc7dc5857dac296444321b9d2'
|
||||
'SKIP'
|
||||
'a8c5a2d526a049b36677a485d8e12a6ccbabc6118ba760e2e08785650b89ae13b155242c7c5f557fb229ffcdea6ff6d5b0de1d0c66b7f2a1711bee7d01a4b663'
|
||||
'SKIP'
|
||||
'990e6566c446ce030d1333a05de9027a994054e983bf414e9aa09505c94d0615f1726494e139320b0d1c923c680565b2cf4249bd062e9e8aa98b226386c03c26'
|
||||
'SKIP'
|
||||
'038f03bc543297a3f2e7612afdee7b27eb5d65d7f81c22976936211f4a80acd9f0faf1ba6c56e20fc653b877a448ab7872b5488da3684952682d80c752227ab2'
|
||||
'SKIP'
|
||||
'675b70e1df1083021fb6336e50d10012dc02e1a80865a64579256319ca98c8282af20e7210ef9d993f97718c7bfed2315f23edac04e6f3af65a1e08cd5f7ef2e'
|
||||
'SKIP'
|
||||
'461f2f6543501306faa5decd98211699f0ce84eea5a1225145dc401ec0ca893c9d8021359c04af4dec265e7d247f2fbb70cfe8d5382e3c38fd2774e017de4aed'
|
||||
'SKIP'
|
||||
'89f95c096f8e487e2a1a00541087d157321b125ae93dc656af0cf6ead9158401a028f5c838c4b81aeb95e7c4951a3b4dfb1a88e08297a03236c0ad36eb6710d2'
|
||||
'SKIP'
|
||||
'bcf683825da1e56692d7024748501cc582e623168fc1a8713ef3b4eb284222f6bf9144871d6357464a1c8c031f105ca6cac6cc591b5463d8b72eb139fcf044f0'
|
||||
'SKIP'
|
||||
'de3e38dbb2395c765767aed516ae3d143e3187a44964f90c587f41f93447c43515481e3c9bd562175d750d0dfb9e4e3eacb25c31f8bf54168fa544c938955eae'
|
||||
'SKIP'
|
||||
'cc2d886da8c51eb7bdbed694423eae29dc05dc2c7bd0cd41b9ee3acbc56ef135043bb48275c4162d33d2d4051a0a8b27f3aec097335b9d15e38fd841a6793f71'
|
||||
'SKIP'
|
||||
'2e0cc2255c0313ab85547363d7dd060d460db44131b698235275413c51e79cdc33b77064f84d56e75a0951fc62f947482c2f317a0d4f732822a4ffaed943a9cd'
|
||||
'SKIP'
|
||||
'9727ad8cf219ba906021f833cacbbccf6c5b9c94decf861a5f40627680ac3d19d65eaeafecd575545dc7eb538f27b0ecc55a7462b49d226751ad14fb2f40e825'
|
||||
'SKIP'
|
||||
'f9113fcb1b8ee8d96744e45f020fd8ec49546d6a29883544f4d4a4ef1087b764de6e7c37c760ac709370cdace9619aec84f03713be5e6bc9a9e90d97dd35caa0'
|
||||
'SKIP'
|
||||
'5d18e00cc44710f078037f25c61741a078bb0fc906d6d5555e581e093d9e99be71f7f06fc0d139f4f25d40f5f854378031aff6e63d26ead55fe6cca626df50bd'
|
||||
'SKIP'
|
||||
'ebe3bc47dadf5d689258c5ccf9883838d3383dc43bec68d2a6767b6348cf1515a98ec9e445c3110e8eb0d87e742c20a0d4ddb70649ec94217f55aad7d18552af'
|
||||
'SKIP')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$_basever
|
||||
|
||||
msg "Applying patches..."
|
||||
for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
|
||||
local patch="bash${_basever//.}-$(printf "%03d" $_p)"
|
||||
msg2 "applying patch ${patch}"
|
||||
patch -Np0 -i ../"${patch}"
|
||||
done
|
||||
# add patches from gentoo, fixing various upstream reported issues
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-shells/bash/files
|
||||
patch -Np0 -i ../bash-5.2_p15-configure-clang16.patch
|
||||
patch -Np0 -i ../bash-5.2_p15-random-ub.patch
|
||||
patch -Np0 -i ../bash-5.2_p21-configure-strtold.patch
|
||||
patch -Np0 -i ../bash-5.2_p21-wpointer-to-int.patch
|
||||
patch -Np0 -i ../bash-5.2_p26-memory-leaks.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -82,64 +155,4 @@ package() {
|
|||
install -m644 dot.bash_logout "$pkgdir/etc/skel/.bash_logout"
|
||||
}
|
||||
|
||||
sha256sums=('a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb'
|
||||
'SKIP'
|
||||
'959bc596166c9758fdd68836581f6b8f1d6fdb947d580bf24dce607998a077b8'
|
||||
'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2'
|
||||
'4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5'
|
||||
'89053ee31f8607bf4371cba46864bda07c51625fd19c6806a9b7bbf526aaf7f4'
|
||||
'025bccfb374a3edce0ff8154d990689f30976b78f7a932dc9a6fcef81821811e'
|
||||
'f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a'
|
||||
'SKIP'
|
||||
'45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8'
|
||||
'SKIP'
|
||||
'6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff'
|
||||
'SKIP'
|
||||
'38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512'
|
||||
'SKIP'
|
||||
'ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357'
|
||||
'SKIP'
|
||||
'd1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c'
|
||||
'SKIP'
|
||||
'2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490'
|
||||
'SKIP'
|
||||
'6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8'
|
||||
'SKIP'
|
||||
'f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd'
|
||||
'SKIP'
|
||||
'c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd'
|
||||
'SKIP'
|
||||
'831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4'
|
||||
'SKIP'
|
||||
'2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c'
|
||||
'SKIP'
|
||||
'094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6'
|
||||
'SKIP'
|
||||
'3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624'
|
||||
'SKIP'
|
||||
'ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a'
|
||||
'SKIP'
|
||||
'155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915'
|
||||
'SKIP'
|
||||
'1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89'
|
||||
'SKIP'
|
||||
'4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80'
|
||||
'SKIP'
|
||||
'325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282'
|
||||
'SKIP'
|
||||
'b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d'
|
||||
'SKIP'
|
||||
'8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd'
|
||||
'SKIP'
|
||||
'78b5230a49594ec30811e72dcd0f56d1089710ec7828621022d08507aa57e470'
|
||||
'SKIP'
|
||||
'af905502e2106c8510ba2085aa2b56e64830fc0fdf6ee67ebb459ac11696dcd3'
|
||||
'SKIP'
|
||||
'971534490117eb05d97d7fd81f5f9d8daf927b4d581231844ffae485651b02c3'
|
||||
'SKIP'
|
||||
'5138f487e7cf71a6323dc81d22419906f1535b89835cc2ff68847e1a35613075'
|
||||
'SKIP'
|
||||
'96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac'
|
||||
'SKIP')
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
|
|||
37
bash/bash-5.2_p15-configure-clang16.patch
Normal file
37
bash/bash-5.2_p15-configure-clang16.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00000.html)
|
||||
|
||||
From 2cdf8b42885189b3cf7c47096b01f104e520546a Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 2 Feb 2023 05:43:37 +0000
|
||||
Subject: [PATCH] aclocal.m4: fix -Wimplicit-function-declaration in dup2 check
|
||||
|
||||
dup2 requires a <unistd.h> include. Fixes the following when diffing config.log
|
||||
when testing with a stricter compiler:
|
||||
```
|
||||
-warning: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
+error: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
```
|
||||
--- aclocal.m4
|
||||
+++ aclocal.m4
|
||||
@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken,
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
int
|
||||
main()
|
||||
{
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -18121,6 +18121,9 @@ else $as_nop
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
int
|
||||
main()
|
||||
{
|
||||
13
bash/bash-5.2_p15-random-ub.patch
Normal file
13
bash/bash-5.2_p15-random-ub.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
https://lists.gnu.org/archive/html/bug-bash/2023-01/msg00016.html
|
||||
https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=0647e53bd15c8982d89a03c2db1643aedd7cd649
|
||||
|
||||
--- lib/sh/random.c
|
||||
+++ lib/sh/random.c
|
||||
@@ -75,7 +75,7 @@ u_bits32_t last;
|
||||
/* Can't seed with 0. */
|
||||
ret = (last == 0) ? 123459876 : last;
|
||||
h = ret / 127773;
|
||||
- l = ret - (127773 * h);
|
||||
+ l = ret % 127773;
|
||||
t = 16807 * l - 2836 * h;
|
||||
ret = (t < 0) ? t + 0x7fffffff : t;
|
||||
32
bash/bash-5.2_p21-configure-strtold.patch
Normal file
32
bash/bash-5.2_p21-configure-strtold.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
https://src.fedoraproject.org/rpms/bash/blob/bd5ac20b134f2936c54245fc83a8e70207d3e07e/f/bash-configure-c99-2.patch
|
||||
|
||||
Another C compatibility issue: char ** and char * are distinct types,
|
||||
and strtold expects the former for its second argument.
|
||||
|
||||
Submitted upstream:
|
||||
|
||||
<https://lists.gnu.org/archive/html/bug-bash/2023-11/msg00104.html>
|
||||
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -885,7 +885,7 @@ AC_CHECK_DECLS([strtold], [
|
||||
[AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <stdlib.h>]],
|
||||
- [[long double r; char *foo, bar; r = strtold(foo, &bar);]]
|
||||
+ [[long double r; char *foo, *bar; r = strtold(foo, &bar);]]
|
||||
)],
|
||||
[bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes])
|
||||
]
|
||||
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -15676,7 +15676,7 @@ else $as_nop
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
-long double r; char *foo, bar; r = strtold(foo, &bar);
|
||||
+long double r; char *foo, *bar; r = strtold(foo, &bar);
|
||||
|
||||
;
|
||||
return 0;
|
||||
13
bash/bash-5.2_p21-wpointer-to-int.patch
Normal file
13
bash/bash-5.2_p21-wpointer-to-int.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
https://lists.gnu.org/archive/html/bug-bash/2023-03/msg00116.html
|
||||
https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=57d4dc15ff35895a1c1248f948f59739ffb99fde
|
||||
--- lib/sh/random.c
|
||||
+++ lib/sh/random.c
|
||||
@@ -90,7 +90,7 @@ genseed ()
|
||||
u_bits32_t iv;
|
||||
|
||||
gettimeofday (&tv, NULL);
|
||||
- iv = (u_bits32_t)seedrand; /* let the compiler truncate */
|
||||
+ iv = (uintptr_t)seedrand; /* let the compiler truncate */
|
||||
iv = tv.tv_sec ^ tv.tv_usec ^ getpid () ^ getppid () ^ current_user.uid ^ iv;
|
||||
return (iv);
|
||||
}
|
||||
136
bash/bash-5.2_p26-memory-leaks.patch
Normal file
136
bash/bash-5.2_p26-memory-leaks.patch
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00036.html
|
||||
https://lists.gnu.org/archive/html/bug-bash/2024-01/txtm8yNNPR9RQ.txt
|
||||
|
||||
For evalstring.c:
|
||||
* https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00011.html
|
||||
* https://git.savannah.gnu.org/cgit/bash.git/diff/builtins/evalstring.c?h=devel&id=81f7b44564cd1510788035cea7c59631865a7db2&dt=1#n766
|
||||
|
||||
From 711ab85262884f2b91f09eceb9aefd0e2426ce67 Mon Sep 17 00:00:00 2001
|
||||
From: Grisha Levit <grishalevit@gmail.com>
|
||||
Date: Sat, 3 Jun 2023 16:51:26 -0400
|
||||
Subject: [PATCH] various leaks
|
||||
|
||||
Found mostly by normal usage running a no-bash-malloc build with clang's
|
||||
LeakSanitizer enabled. So far seems to provide very accurate results.
|
||||
|
||||
* arrayfunc.c
|
||||
- quote_compound_array_word: make sure to free VALUE
|
||||
- bind_assoc_var_internal: if assigning to a dynamic variable, make sure
|
||||
to free the key (usually assoc_insert would do it)
|
||||
|
||||
* bashline.c
|
||||
- bash_command_name_stat_hook: free original *NAME if we are going to
|
||||
change what it points to (what the callers seem to expect)
|
||||
|
||||
* builtins/evalstring.c
|
||||
- parse_and_execute: make sure to dispose of the parsed command
|
||||
resulting from a failed function import attempt
|
||||
- open_redir_file: if we did not get a pointer to pass back the expanded
|
||||
filename, make sure to free the name
|
||||
|
||||
* examples/loadables/stat.c
|
||||
- loadstat: bind_assoc_variable does not free its VALUE argument so make
|
||||
sure to do it
|
||||
|
||||
* subst.c
|
||||
- param_expand: free temp1 value for codepaths that don't do it
|
||||
---
|
||||
arrayfunc.c | 6 +++++-
|
||||
bashline.c | 1 +
|
||||
builtins/evalstring.c | 4 ++++
|
||||
examples/loadables/stat.c | 1 +
|
||||
subst.c | 2 ++
|
||||
5 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arrayfunc.c b/arrayfunc.c
|
||||
index 2c05d15b..8ba64084 100644
|
||||
--- arrayfunc.c
|
||||
+++ arrayfunc.c
|
||||
@@ -208,7 +208,10 @@ bind_assoc_var_internal (entry, hash, key, value, flags)
|
||||
newval = make_array_variable_value (entry, 0, key, value, flags);
|
||||
|
||||
if (entry->assign_func)
|
||||
- (*entry->assign_func) (entry, newval, 0, key);
|
||||
+ {
|
||||
+ (*entry->assign_func) (entry, newval, 0, key);
|
||||
+ FREE (key);
|
||||
+ }
|
||||
else
|
||||
assoc_insert (hash, key, newval);
|
||||
|
||||
@@ -985,6 +988,7 @@ quote_compound_array_word (w, type)
|
||||
if (t != w+ind)
|
||||
free (t);
|
||||
strcpy (nword + i, value);
|
||||
+ free (value);
|
||||
|
||||
return nword;
|
||||
}
|
||||
diff --git a/bashline.c b/bashline.c
|
||||
index c85b05b6..bd7548cc 100644
|
||||
--- bashline.c
|
||||
+++ bashline.c
|
||||
@@ -1928,6 +1928,7 @@ bash_command_name_stat_hook (name)
|
||||
result = search_for_command (cname, 0);
|
||||
if (result)
|
||||
{
|
||||
+ FREE (*name);
|
||||
*name = result;
|
||||
return 1;
|
||||
}
|
||||
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
|
||||
index df3dd68e..20c6a4a7 100644
|
||||
--- builtins/evalstring.c
|
||||
+++ builtins/evalstring.c
|
||||
@@ -461,6 +461,8 @@ parse_and_execute (string, from_file, flags)
|
||||
should_jump_to_top_level = 0;
|
||||
last_result = last_command_exit_value = EX_BADUSAGE;
|
||||
set_pipestatus_from_exit (last_command_exit_value);
|
||||
+ dispose_command(command);
|
||||
+ global_command = (COMMAND *)NULL;
|
||||
reset_parser ();
|
||||
break;
|
||||
}
|
||||
@@ -762,6 +764,8 @@ open_redir_file (r, fnp)
|
||||
|
||||
if (fnp)
|
||||
*fnp = fn;
|
||||
+ else
|
||||
+ free (fn);
|
||||
return fd;
|
||||
}
|
||||
|
||||
diff --git a/examples/loadables/stat.c b/examples/loadables/stat.c
|
||||
index 1e60e7b6..ed5c9764 100644
|
||||
--- examples/loadables/stat.c
|
||||
+++ examples/loadables/stat.c
|
||||
@@ -349,6 +349,7 @@ loadstat (vname, var, fname, flags, fmt, sp)
|
||||
key = savestring (arraysubs[i]);
|
||||
value = statval (i, fname, flags, fmt, sp);
|
||||
v = bind_assoc_variable (var, vname, key, value, ASS_FORCE);
|
||||
+ free (value);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
diff --git a/subst.c b/subst.c
|
||||
index 1ac6eb2d..ff0602da 100644
|
||||
--- subst.c
|
||||
+++ subst.c
|
||||
@@ -10727,6 +10727,7 @@ comsub:
|
||||
{
|
||||
chk_atstar (temp, quoted, pflags, quoted_dollar_at_p, contains_dollar_at);
|
||||
tdesc = parameter_brace_expand_word (temp, SPECIAL_VAR (temp, 0), quoted, pflags, 0);
|
||||
+ free (temp1);
|
||||
if (tdesc == &expand_wdesc_error || tdesc == &expand_wdesc_fatal)
|
||||
return (tdesc);
|
||||
ret = tdesc;
|
||||
@@ -10739,6 +10740,7 @@ comsub:
|
||||
{
|
||||
set_exit_status (EXECUTION_FAILURE);
|
||||
report_error (_("%s: invalid variable name for name reference"), temp);
|
||||
+ free (temp1);
|
||||
return (&expand_wdesc_error); /* XXX */
|
||||
}
|
||||
else
|
||||
--
|
||||
2.43.0
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=gnutls
|
||||
pkgver=3.8.5
|
||||
pkgver=3.8.6
|
||||
pkgrel=01
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer w/o zstd "
|
||||
url="https://www.gnutls.org/"
|
||||
|
|
@ -82,10 +82,10 @@ license=('GPL-3.0-or-later AND LGPL-2.1-or-later')
|
|||
#validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
|
||||
validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric@redhat.com>"
|
||||
|
||||
sha256sums=(66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc # gnutls-3.8.5.tar.xz
|
||||
130b504603275be07f7d5ee37d871ab2be7bec8186779b70f327a2f9db35cd02 # gnutls-3.8.5.tar.xz.sig
|
||||
sha256sums=(2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd # gnutls-3.8.6.tar.xz
|
||||
0e4ce7ae73d2f595ab5eb21498c7df37ae97f920a532850f22252aa906060ba1 # gnutls-3.8.6.tar.xz.sig
|
||||
22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5 # config
|
||||
2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708) # gnutls-ktls_disable_keyupdate_test.patch
|
||||
|
||||
## db603cafc6e310a362e9b479cc205c5d8a7d5dc99a1a5b66602a763c0fef9ea3 gnutls-3.8.5-01-x86_64.pkg.tar.lz
|
||||
## faa4aba456002b9301c474e3bd729e2e97ec8a9223cedc51eb852f9896e18955 gnutls-3.8.6-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||
|
||||
pkgname=gnutls
|
||||
pkgver=3.8.5
|
||||
pkgver=3.8.6
|
||||
pkgrel=1
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer"
|
||||
arch=('x86_64')
|
||||
|
|
@ -21,7 +21,7 @@ backup=(etc/gnutls/config
|
|||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
config
|
||||
gnutls-ktls_disable_keyupdate_test.patch)
|
||||
sha256sums=('66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc'
|
||||
sha256sums=('2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd'
|
||||
'SKIP'
|
||||
'22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5'
|
||||
'2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708')
|
||||
|
|
|
|||
|
|
@ -8,13 +8,12 @@
|
|||
## rebuild after any libbpf upgrade ##
|
||||
pkgname=iproute2
|
||||
pkgver=6.9.0
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='IP Routing Utilities'
|
||||
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
|
||||
depends=('glibc' 'iptables' 'libcap' 'libelf' 'libbpf')
|
||||
makedepends=('db5.3')
|
||||
depends=('glibc' 'libxtables.so' 'libcap' 'libelf' 'libbpf')
|
||||
makedepends=('db5.3' 'iptables')
|
||||
optdepends=('db5.3: userspace arp daemon'
|
||||
'libcap: tipc'
|
||||
'linux-atm: ATM support'
|
||||
'python: for routel')
|
||||
provides=('iproute')
|
||||
|
|
@ -85,5 +84,5 @@ sha256sums=(2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 #
|
|||
758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch
|
||||
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch
|
||||
|
||||
## 3bb8cc590524aab1a8ae2719caef89165d64c256df977f670b6ce5e345be7692 iproute2-6.9.0-01-x86_64.pkg.tar.lz
|
||||
## a75011498072b33140a8bb713a3bd78f6faeaf6c7cbdef3d9e7b38c5f7146e27 iproute2-6.9.0-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,22 @@
|
|||
|
||||
pkgname=iproute2
|
||||
pkgver=6.9.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='IP Routing Utilities'
|
||||
arch=('x86_64')
|
||||
license=('GPL2')
|
||||
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
|
||||
depends=('glibc' 'iptables' 'libcap' 'libelf' 'libbpf')
|
||||
depends=('glibc'
|
||||
'libxtables.so' # from iptables or iptables-nft
|
||||
'libcap' 'libcap.so'
|
||||
'libelf'
|
||||
'libbpf' 'libbpf.so')
|
||||
makedepends=('db5.3')
|
||||
optdepends=('db5.3: userspace arp daemon'
|
||||
'linux-atm: ATM support'
|
||||
'python: for routel')
|
||||
provides=('iproute')
|
||||
makedepends=('linux-atm')
|
||||
makedepends=('linux-atm' 'iptables')
|
||||
options=('staticlibs')
|
||||
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
|
||||
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,13 @@
|
|||
pkgbase=iptables
|
||||
pkgname=(iptables iptables-nft)
|
||||
pkgver=1.8.10
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc='Linux kernel packet control tool - w/o ipv6 & systemd'
|
||||
url='https://www.netfilter.org/projects/iptables/index.html'
|
||||
depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash)
|
||||
makedepends=(linux-api-headers)
|
||||
provides=(libip4tc.so libip6tc.so libipq.so libxtables.so)
|
||||
backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
|
||||
source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.xz{,.sig}
|
||||
empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules
|
||||
|
|
@ -57,7 +58,7 @@ package_iptables() {
|
|||
package_iptables-nft() {
|
||||
pkgdesc+=' (using nft interface - no ipv6)'
|
||||
depends+=(nftables)
|
||||
provides=(iptables arptables ebtables)
|
||||
provides+=(iptables arptables ebtables)
|
||||
conflicts=(iptables arptables ebtables)
|
||||
backup+=(etc/{arp,eb}tables.conf)
|
||||
|
||||
|
|
@ -113,6 +114,6 @@ sha256sums=(5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c #
|
|||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
|
||||
## 3cda6157ea7ba9f4e9a7de8e2bb4831dc4a954be82f831b4e5ca5fed66ef2676 iptables-1_1.8.10-01-x86_64.pkg.tar.lz
|
||||
## c0fdcd0db7f885448bfbb3f0e8a5b7a9916c3fbabc7187467bc6a60c93dfda36 iptables-nft-1_1.8.10-01-x86_64.pkg.tar.lz
|
||||
## 7e30341574a4057811c6695773a68052a6a641f7af165c5a17328d6f891ba9f3 iptables-1_1.8.10-02-x86_64.pkg.tar.lz
|
||||
## 894cb113fede9ec87cf7257d636a2765d635f39824399ac8477dfa347cc55053 iptables-nft-1_1.8.10-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
pkgbase=iptables
|
||||
pkgname=(iptables iptables-nft)
|
||||
pkgver=1.8.10
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc='Linux kernel packet control tool'
|
||||
arch=(x86_64)
|
||||
|
|
@ -12,6 +12,7 @@ license=(GPL2)
|
|||
url='https://www.netfilter.org/projects/iptables/index.html'
|
||||
depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash)
|
||||
makedepends=(linux-api-headers)
|
||||
provides=(libip4tc.so libip6tc.so libipq.so libxtables.so)
|
||||
backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
|
||||
source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.xz{,.sig}
|
||||
empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules
|
||||
|
|
@ -72,7 +73,7 @@ package_iptables() {
|
|||
package_iptables-nft() {
|
||||
pkgdesc+=' (using nft interface)'
|
||||
depends+=(nftables)
|
||||
provides=(iptables arptables ebtables)
|
||||
provides+=(iptables arptables ebtables)
|
||||
conflicts=(iptables arptables ebtables)
|
||||
backup+=(etc/{arp,eb}tables.conf)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,30 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=json-c
|
||||
pkgver=0.17
|
||||
pkgrel=01
|
||||
_tagdate=20230812
|
||||
pkgrel=02
|
||||
pkgdesc="A JSON implementation in C"
|
||||
url="https://github.com/json-c/json-c/wiki"
|
||||
depends=(glibc)
|
||||
makedepends=(git cmake ninja)
|
||||
provides=(libjson-c.so)
|
||||
#options=(debug)
|
||||
_commit=b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 # tags/json-c-0.17-20230812^0
|
||||
source=("git+https://github.com/json-c/json-c#commit=$_commit")
|
||||
#_commit=b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 # tags/json-c-0.17-20230812^0
|
||||
#source=("git+https://github.com/json-c/json-c#commit=$_commit")
|
||||
source=("git+https://github.com/json-c/json-c#tag=json-c-$pkgver-$_tagdate")
|
||||
|
||||
pkgver() {
|
||||
cd json-c
|
||||
local tag="$(git describe --tags --abbrev=0)"
|
||||
local ver="$(git describe --tags)"
|
||||
echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/[^-]*-g/r&/;s/-/+/g'
|
||||
}
|
||||
#pkgver() {
|
||||
# cd json-c
|
||||
# local tag="$(git describe --tags --abbrev=0)"
|
||||
# local ver="$(git describe --tags)"
|
||||
# echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/[^-]*-g/r&/;s/-/+/g'
|
||||
#}
|
||||
|
||||
prepare() {
|
||||
cd json-c
|
||||
|
|
@ -39,9 +42,9 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd build
|
||||
ctest --output-on-failure --stop-on-failure -j$(nproc)
|
||||
|
||||
# cd build
|
||||
# ctest --output-on-failure --stop-on-failure -j$(nproc)
|
||||
ctest --test-dir build --output-on-failure --stop-on-failure -j$(nproc)
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
@ -57,5 +60,5 @@ license=(MIT)
|
|||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## 2d75b90af733938b77b372e8a2884d4d96d25206b691646e655ca6042ad2e459 json-c-0.17-01-x86_64.pkg.tar.lz
|
||||
## 1717962f6d984071b48415ec767b506aef784a092d4a7fd5b02c6d26ebb99e12 json-c-0.17-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
|
||||
pkgname=json-c
|
||||
pkgver=0.17
|
||||
pkgrel=1
|
||||
_tagdate=20230812
|
||||
pkgrel=2
|
||||
pkgdesc="A JSON implementation in C"
|
||||
url="https://github.com/json-c/json-c/wiki"
|
||||
license=(MIT)
|
||||
|
|
@ -18,20 +19,8 @@ makedepends=(
|
|||
ninja
|
||||
)
|
||||
provides=(libjson-c.so)
|
||||
_commit=b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 # tags/json-c-0.17-20230812^0
|
||||
source=("git+https://github.com/json-c/json-c#commit=$_commit")
|
||||
b2sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd json-c
|
||||
local tag="$(git describe --tags --abbrev=0)"
|
||||
local ver="$(git describe --tags)"
|
||||
echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/[^-]*-g/r&/;s/-/+/g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd json-c
|
||||
}
|
||||
source=("git+https://github.com/json-c/json-c#tag=json-c-$pkgver-$_tagdate")
|
||||
b2sums=('9e0b0f41703460a4a61bf4e2b005bbc436f0f563a1a82ce8acb399d5efa18744ec86e8610866568fc6f77e3eec097fd688cbb9cb6bfbf7179b8178d8ee2de3ff')
|
||||
|
||||
build() {
|
||||
local cmake_options=(
|
||||
|
|
@ -48,8 +37,7 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd build
|
||||
ctest --output-on-failure --stop-on-failure -j$(nproc)
|
||||
ctest --test-dir build --output-on-failure --stop-on-failure -j$(nproc)
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=pinentry
|
||||
pkgver=1.3.0
|
||||
pkgrel=04
|
||||
pkgver=1.3.1
|
||||
pkgrel=02
|
||||
pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol'
|
||||
url='https://gnupg.org/related_software/pinentry/'
|
||||
depends=('glibc' 'ncurses' 'libassuan' 'libsecret' 'glib2'
|
||||
|
|
@ -60,9 +60,9 @@ validpgpkeys=(D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch (dist sig)
|
|||
6DAA6E64A76D2840571B4902528897B826403ADA # Werner Koch (dist signing 2020)
|
||||
AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD) # Niibe Yutaka (GnuPG Release Key)
|
||||
|
||||
sha256sums=(9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de # pinentry-1.3.0.tar.bz2
|
||||
3d4753e5262a36651dee14ea4e0e9461126d93fddd05f2da2ef95be4cb3ce1f0 # pinentry-1.3.0.tar.bz2.sig
|
||||
40db39c6334917b79c77525451fc8e64861d1578e3e28da65a7870e66719d3e1) # pinentry
|
||||
sha256sums=(bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04 # pinentry-1.3.1.tar.bz2
|
||||
36e80a081647b687596ae148db24675579f86773713104e2d29a8e1b9b0ccb4f # pinentry-1.3.1.tar.bz2.sig
|
||||
2f961cccf9aebddf9c0823a96809a10296d7af6516460ae2d93e8ea5a433166d) # pinentry
|
||||
|
||||
## 9bf0f774025524f968a93818091d8dc6857f397337a73f0bbec22761833b97a7 pinentry-1.3.0-04-x86_64.pkg.tar.lz
|
||||
## a6c557dbd7cea5b4845ffb14d835c9e39c02a1d21e98d8075f7c310662b704c6 pinentry-1.3.1-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: Gaetan Bisson <bisson@archlinux.org>
|
||||
|
||||
pkgname=pinentry
|
||||
pkgver=1.3.0
|
||||
pkgrel=4
|
||||
pkgver=1.3.1
|
||||
pkgrel=2
|
||||
pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol'
|
||||
url='https://gnupg.org/related_software/pinentry/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -24,9 +24,9 @@ optdepends=(
|
|||
backup=('etc/pinentry/preexec')
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
|
||||
'pinentry')
|
||||
sha256sums=('9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de'
|
||||
sha256sums=('bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04'
|
||||
'SKIP'
|
||||
'40db39c6334917b79c77525451fc8e64861d1578e3e28da65a7870e66719d3e1')
|
||||
'2f961cccf9aebddf9c0823a96809a10296d7af6516460ae2d93e8ea5a433166d')
|
||||
validpgpkeys=(
|
||||
'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
# Guess preferred backend based on environment.
|
||||
backends=(curses tty)
|
||||
if [[ -n "$DISPLAY" ]]; then
|
||||
if [[ -n "$DISPLAY" || -n "$WAYLAND_DISPLAY" ]]; then
|
||||
case "$XDG_CURRENT_DESKTOP" in
|
||||
KDE|LXQT|LXQt)
|
||||
backends=(qt qt5 gnome3 gtk curses tty)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue