diff --git a/bash/PKGBUILD b/bash/PKGBUILD index af54576..c0406a6 100644 --- a/bash/PKGBUILD +++ b/bash/PKGBUILD @@ -7,9 +7,9 @@ pkgname=bash _basever=5.2 -_patchlevel=15 +_patchlevel=015 pkgver=${_basever}.${_patchlevel} -pkgrel=01 +pkgrel=02 pkgdesc='The GNU Bourne Again shell' arch=(x86_64) _url='https://www.gnu.org/software/bash/bash.html' @@ -24,6 +24,7 @@ source=($url/$pkgname/bash-$_basever.tar.gz{,.sig} dot.bash_logout system.bashrc system.bash_logout) +install=bash.install if [[ $((10#${_patchlevel})) -gt 0 ]]; then for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do @@ -92,37 +93,36 @@ sha256sums=(a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb # 4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5 # dot.bash_logout 51ceca7cd615ff4e2f8f3373a46ac7bfd453be70bbaddc074cb17f6db1ac7370 # system.bashrc 025bccfb374a3edce0ff8154d990689f30976b78f7a932dc9a6fcef81821811e # system.bash_logout - ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa # bash51-001 - 8f8725a5c52f53d3ef185492e09eaacd92c791e24cad4c75bb5ea8a3b1d302b8 # bash51-001.sig - 15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe # bash51-002 - 44053017c4a1c5242f8585019a8b44c9af6507b41369535e7040205d4573762c # bash51-002.sig - 22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1 # bash51-003 - acaf4a21d10805c32beebca835c600add4119d33ce3dad01c201ef504b4d27f2 # bash51-003.sig - 9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86 # bash51-004 - 51faca8a8799da8bf815d5488394b6d0c1e3d6ebe3956bfb729b0015e445368f # bash51-004.sig - cccbb5e9e6763915d232d29c713007a62b06e65126e3dd2d1128a0dc5ef46da5 # bash51-005 - ed1a3d0165faacc89b3fd6aec2250bf01a584ee3e0a65ff031ebb70d661b0dba # bash51-005.sig - 75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14 # bash51-006 - 0914536dee00241945a6d4323982283d9a9b5e2a4356c2623b9a6d8e71595499 # bash51-006.sig - acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a # bash51-007 - b8f248ca4dcd42144ddd5e3a8ebb72a38313f201685a0c72b886987c6283a3d2 # bash51-007.sig - f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1 # bash51-008 - 3a0591328d5853a5e3f31ba77bda56b4104a681aa49c825cfba11fa99430e4e3 # bash51-008.sig - e45cda953ab4b4b4bde6dc34d0d8ca40d1cc502046eb28070c9ebcd47e33c3ee # bash51-009 - 08ef22908e2dc942a94bcdf32f4e4bd4846601e0087aea6ff357f3a0d2fa508e # bash51-009.sig - a2c8d7b2704eeceff7b1503b7ad9500ea1cb6e9393faebdb3acd2afdd7aeae2a # bash51-010 - d99ce7ff8caf724ad64484caeb4f7300cd79c0c773bcf7429e391538f8c7fc80 # bash51-010.sig - 58191f164934200746f48459a05bca34d1aec1180b08ca2deeee3bb29622027b # bash51-011 - 842161b382c59fa4214f012f8df40bc7e504157fe2ed34652dc8aa1ec1a4fb29 # bash51-011.sig - 10f189c8367c4a15c7392e7bf70d0ff6953f78c9b312ed7622303a779273ab98 # bash51-012 - 37cc1746a5ca0ca3c299cb130efd6062a71b300f95c11e3e8d5f092a28c85911 # bash51-012.sig - c7acb66df435d284304c16ca83a5265f9edd9368612095b01a733d45c77ed5ad # bash51-013 - 0ddca62d8df55ef4e9a408baaf13acbd422074798093515b8e76c16c05a63565 # bash51-013.sig - 6a4ee0c81b437b96279a792c1efcec4ba56f009195a318083db6b53b096f83d0 # bash51-014 - 4ef42bb84993ebb3c44344ee2ee43824271627688401937f7812080fd5d0aa8a # bash51-014.sig - 1b37692ef1f6cc3dcec246773443276066e6b1379868f8c14e01f4dfd4df80f0 # bash51-015 - 379a451a66271bae61d11c2c06f207292790b693ad19209ea267da4cee133b02 # bash51-015.sig - 8899144f76a5db1fb41a89ed881c9f19add95728dd71db324f772ef225c5384f # bash51-016 - 4434cf0bdcfb49cb203373121122be9718f25b51eaf71d0dd3d31d1f9d621201) # bash51-016.sig - + f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a # bash52-001 + 3a16ed6925e88255f9bf1435d418a11fc73a05b9efe65f4049e1de00f867d495 # bash52-001.sig + 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8 # bash52-002 + 3e1518df8be46d80d513132ab2b2b85c8832acb79b3aeecc27a5cee9f9ea55f8 # bash52-002.sig + 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff # bash52-003 + 40875e5f67e0632c96250557e77b74b85d8fd13c9301acc192524a0169b5ac25 # bash52-003.sig + 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512 # bash52-004 + 2aeeba38424a8d0a9c34bdef45e6a49670bb2223f2785325913846ce112be21a # bash52-004.sig + ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357 # bash52-005 + f1c8e9be4aa8387927b2d299618c257c909abcd57d54798e3fffec4504b8abe4 # bash52-005.sig + d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c # bash52-006 + e1393530bc599240e0eb09a70b3382e987ab22ad10e6661ba77a4fbf38eead47 # bash52-006.sig + 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490 # bash52-007 + 0aeef6447173039444d9252c598c05540b76158639a985ccf5568cb876798b52 # bash52-007.sig + 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8 # bash52-008 + 0064f392cf82a8a281a7598f55ebcf7b45b08cfed5d53d60827214f7d38a7f2f # bash52-008.sig + f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd # bash52-009 + 822f9f0e67710248874d53e9b0e26bf1c8cfa0d117cc9bcc3479732f231eb43b # bash52-009.sig + c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd # bash52-010 + 0c63fbb628dd3370cbae71b3112ce9c4b803fcab2d423dd2bd47010ec3c19ad0 # bash52-010.sig + 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4 # bash52-011 + 6bb9007fb328b5442ca1580b14f913aa93dfb21b1d174cd35458bae7c276f4cb # bash52-011.sig + 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c # bash52-012 + 2f34efb5bec9cfac100224eb08889a1b9cf2cfb354952fb6971a44ff287604b2 # bash52-012.sig + 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6 # bash52-013 + cc67cf35ef48c3f01838a3b44e9169179e4e98339ac9f2bd4709e0ffc9ff40ca # bash52-013.sig + 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624 # bash52-014 + 27f135050b6d251eaf4fb42bf07a3b94e71606d0137ee24d1f42f11436616aaa # bash52-014.sig + ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a # bash52-015 + 5f8d42f6af8e488dfc13193a7cf7c5a738b537cdacee1a8144bb0c38b0f689f1) # bash52-015.sig + +## 2dfe5d19ef4dcdfa511bb2a9eed3107f8a92e7b5b4083c2a60513b6e28865724 bash-5.2.015-02-x86_64.pkg.tar.lz diff --git a/bash/PKGBUILD-arch b/bash/PKGBUILD-arch index 40f577b..dd6c325 100644 --- a/bash/PKGBUILD-arch +++ b/bash/PKGBUILD-arch @@ -6,9 +6,9 @@ pkgname=bash _basever=5.2 -_patchlevel=15 +_patchlevel=015 pkgver=${_basever}.${_patchlevel} -pkgrel=1 +pkgrel=4 pkgdesc='The GNU Bourne Again shell' arch=(x86_64) license=(GPL) @@ -17,6 +17,7 @@ backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) depends=(readline libreadline.so glibc ncurses) optdepends=('bash-completion: for tab completion') provides=('sh') +install=bash.install source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bashrc dot.bash_profile @@ -24,43 +25,6 @@ source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} system.bashrc system.bash_logout) validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey -sha256sums=('a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb' - 'SKIP' - '3e22bf86ae6708df7a6bceb88c67a00118275f9c0b5268f453dd388af7c43b53' - 'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2' - '4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5' - '51ceca7cd615ff4e2f8f3373a46ac7bfd453be70bbaddc074cb17f6db1ac7370' - '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') if [[ $((10#${_patchlevel})) -gt 0 ]]; then for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do @@ -116,4 +80,42 @@ package() { install -m644 dot.bash_logout "$pkgdir/etc/skel/.bash_logout" } +sha256sums=('a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb' + 'SKIP' + '959bc596166c9758fdd68836581f6b8f1d6fdb947d580bf24dce607998a077b8' + 'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2' + '4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5' + '51ceca7cd615ff4e2f8f3373a46ac7bfd453be70bbaddc074cb17f6db1ac7370' + '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') + # vim: ts=2 sw=2 et: diff --git a/bash/bash.install b/bash/bash.install new file mode 100644 index 0000000..8b17673 --- /dev/null +++ b/bash/bash.install @@ -0,0 +1,9 @@ +post_upgrade() { + grep -qe '^/bin/bash$' etc/shells || echo '/bin/bash' >> etc/shells + grep -qe '^/usr/bin/bash$' etc/shells || echo '/usr/bin/bash' >> etc/shells + grep -qe '^/bin/rbash$' etc/shells || echo '/bin/rbash' >> etc/shells + grep -qe '^/usr/bin/rbash$' etc/shells || echo '/usr/bin/rbash' >> etc/shells + grep -qe '^/bin/sh$' etc/shells || echo '/bin/sh' >> etc/shells + grep -qe '^/usr/bin/sh$' etc/shells || echo '/usr/bin/sh' >> etc/shells +} + diff --git a/bash/sums.0 b/bash/sums.0 new file mode 100644 index 0000000..adfc81f --- /dev/null +++ b/bash/sums.0 @@ -0,0 +1,31 @@ + f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a # bash52-001 + 3a16ed6925e88255f9bf1435d418a11fc73a05b9efe65f4049e1de00f867d495 # bash52-001.sig + 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8 # bash52-002 + 3e1518df8be46d80d513132ab2b2b85c8832acb79b3aeecc27a5cee9f9ea55f8 # bash52-002.sig + 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff # bash52-003 + 40875e5f67e0632c96250557e77b74b85d8fd13c9301acc192524a0169b5ac25 # bash52-003.sig + 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512 # bash52-004 + 2aeeba38424a8d0a9c34bdef45e6a49670bb2223f2785325913846ce112be21a # bash52-004.sig + ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357 # bash52-005 + f1c8e9be4aa8387927b2d299618c257c909abcd57d54798e3fffec4504b8abe4 # bash52-005.sig + d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c # bash52-006 + e1393530bc599240e0eb09a70b3382e987ab22ad10e6661ba77a4fbf38eead47 # bash52-006.sig + 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490 # bash52-007 + 0aeef6447173039444d9252c598c05540b76158639a985ccf5568cb876798b52 # bash52-007.sig + 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8 # bash52-008 + 0064f392cf82a8a281a7598f55ebcf7b45b08cfed5d53d60827214f7d38a7f2f # bash52-008.sig + f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd # bash52-009 + 822f9f0e67710248874d53e9b0e26bf1c8cfa0d117cc9bcc3479732f231eb43b # bash52-009.sig + c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd # bash52-010 + 0c63fbb628dd3370cbae71b3112ce9c4b803fcab2d423dd2bd47010ec3c19ad0 # bash52-010.sig + 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4 # bash52-011 + 6bb9007fb328b5442ca1580b14f913aa93dfb21b1d174cd35458bae7c276f4cb # bash52-011.sig + 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c # bash52-012 + 2f34efb5bec9cfac100224eb08889a1b9cf2cfb354952fb6971a44ff287604b2 # bash52-012.sig + 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6 # bash52-013 + cc67cf35ef48c3f01838a3b44e9169179e4e98339ac9f2bd4709e0ffc9ff40ca # bash52-013.sig + 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624 # bash52-014 + 27f135050b6d251eaf4fb42bf07a3b94e71606d0137ee24d1f42f11436616aaa # bash52-014.sig + ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a # bash52-015 + 5f8d42f6af8e488dfc13193a7cf7c5a738b537cdacee1a8144bb0c38b0f689f1) # bash52-015.sig + diff --git a/linux/PKGBUILD b/linux/PKGBUILD index 47b8e34..b5e8780 100644 --- a/linux/PKGBUILD +++ b/linux/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=linux -pkgver=5.15.132 +pkgver=5.15.133 pkgrel=01 pkgdesc='Linux LTS 5.15 w/o zstd ipv6 + vfio i915 patch' url="https://www.kernel.org/" @@ -223,19 +223,18 @@ validpgpkeys=(ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E) # Greg Kroah-Hartman # https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc --> sha256sums -# sha256sums:4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac linux-5.15.132.tar.xz +# sha256sums:ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz -sha256sums=(4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac # linux-5.15.132.tar.xz - 9c1516fe58891e9186eeaff969fa30201da14709b6816a53db63582f4e37f174 # linux-5.15.132.tar.sign - ff7dc67cea47b0bd6505423f43ff2f4b227252ffb4a92d064f08acb1717d990e # config +sha256sums=(ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd # linux-5.15.133.tar.xz + e5ff9fcd263e39bcaf16cf09a34c36557b78bd2b8ac9200389d21fedeff5b5b1 # linux-5.15.133.tar.sign + b5da221c8c32091fc59c5f1acb358e2649b20c06259cef90c55d9698302d8452 # config 3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd # 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786 # 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch 8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c # 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch 5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde # 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch 067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9 # 0005-lg-laptop-Recognize-more-models.patch 856230cfbdc2bb53a4920dfbcb6fb2d58427b7b184e5f94e21f08011d0a2fcc6 # i915-vga-arbiter.patch - ef15845ece7bc90696c722ac031d2794a33bd73be7e401fbec48e4446c3717ae) # sha256sums - -## 418afdacce9e8647345f278d6abb7fe60c6f3d8b426e43d513ec0df56264bc33 linux-5.15.132-01-x86_64.pkg.tar.lz -## 82878e65e0c4df544f2e1f44de0c074b2d75f4a1ea3c6e5e71ba0cdded9e9c2d linux-headers-5.15.132-01-x86_64.pkg.tar.lz + c2ff5ff08c10c1fe7a473ce80a665eb28f70ec616d5e258a04a27cfc17198613) # sha256sums +## 67a6426baee512ee07636efc5437cca8bb05dc3cef369f45540088bc87d3cb3f linux-5.15.133-01-x86_64.pkg.tar.lz +## 2c76c03beb7e745dac6bdc01f91befdc740a56238baf75e9ffd7fa24c230bc05 linux-headers-5.15.133-01-x86_64.pkg.tar.lz diff --git a/linux/config b/linux/config index e17317f..33e2de7 100644 --- a/linux/config +++ b/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.135 Kernel Configuration +# Linux/x86 5.15.133 Kernel Configuration # # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230804" diff --git a/linux/sha256sums b/linux/sha256sums index 34b0d84..d0c3f23 100644 --- a/linux/sha256sums +++ b/linux/sha256sums @@ -343,6 +343,7 @@ e0ba691027fec388f6476284f54857d8d0712c9ce6ca6d6d77b868927034b9d4 ChangeLog-5.4. 6a48a7865ca6118344d6144f306f147456d84c51fc85e50912e3fbab013cb60d ChangeLog-5.4.254 9c254a157dd9223e64c37bebccfc65c4ff1731fcfc74dfa14c8d9f849da18dad ChangeLog-5.4.255 47cedeb3ed38588fffa9129e5bf850d0d3efbff13dbf293c2bf1ee812ed2f98d ChangeLog-5.4.256 +a90f2051ee8c5f8b4230911e2ae99d90f56fd57d739ffa5ac36be15c62e64ebc ChangeLog-5.4.257 b06ab2b602fc03f3a5ee3e5bbb93b4d1a6ed33f09440ba57fc2f90f7f5339576 ChangeLog-5.5 70703385d5a64eb604eb7db844319fd9b6908aea346d2488b5860a7982d6e591 ChangeLog-5.5.1 e77d916573c237b1422b89845f520f416c4a58df7f869eec401a68c6135b9842 ChangeLog-5.5.2 @@ -635,6 +636,8 @@ e51038e6d7080ee224d6b1263afafd64a47ef01f308d05114b99e1c416caac69 ChangeLog-5.10 bf8f6d70c9fbea18338758686ee2892b383ad59fad357324c409a04325fff4aa ChangeLog-5.10.193 b777407f8e47d5556d75993c9a01c0386b1ca1f0cfd3cc63eff13564c53f8c0a ChangeLog-5.10.194 a88261541ebb0f206c21dc0ec7c3c27fa3ab10945524ced2a1c4506922178eba ChangeLog-5.10.195 +93bc08e97fbcee5fd11150333ff9a2e8ad3ac4a7229263892d5b176221e6794c ChangeLog-5.10.196 +5d270c80f24401455f04c1105f8bdb336c4bee5e09445569634c3ca1e74926e6 ChangeLog-5.10.197 1b67a4eb91d8009cf5b47521caae0ff1c904e4fb0ec95e4c2562b61a772f3e16 ChangeLog-5.11 61e4714a1413779d4c9bf707de34ca7146714eb787a9078bcd51c8c18489dc7e ChangeLog-5.11.1 548b64c633da18f18021e72b4c9ba3212d699df6c56e9496277285283df300f5 ChangeLog-5.11.2 @@ -853,6 +856,7 @@ b4846c8e3c0b3ee97d84fce74e67093c286483034a634c526128397e85f5de28 ChangeLog-5.15 1e58e5913fe78c809f9b5050cca73d07c1d203b4eb39359b44eac11c3a4dd8db ChangeLog-5.15.130 eb9231a8edbb65c2cb995d5533c5d114845e08f43f5456583835bd468001a026 ChangeLog-5.15.131 d73492ca45b313a503a7ba5b78622399dd889b6d06de385bfafdbe4d728225ee ChangeLog-5.15.132 +e80cf447d0f283922328045dcf698d8342bebebfb913b4cd56e14d4e3be716c8 ChangeLog-5.15.133 8973679b5da41c4f9f3a12edf2598bcea3ee4a4988a179f36c4c8d4ec9c96e6f ChangeLog-5.16 694254b586ab67c329bc79a3b0a60f74771b97aebe314aff66c944ec454acb98 ChangeLog-5.16.1 5f029a42102d90a5ca51c2d7d64095dbd846fbf6391582ac9e2f7a791e33b3dd ChangeLog-5.16.2 @@ -1613,6 +1617,8 @@ bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251. 34d5ed902f47d90f27b9d5d6b8db0d3fa660834111f9452e166d920968a4a061 linux-5.4.255.tar.xz 61f6148ab308629ca95680e7d18695de0f41e4c08a95013b38a93c2fae13bc83 linux-5.4.256.tar.gz c7a4086ba23507b8539d18534565de0d6591138bfa2e449e93964fd5132e353a linux-5.4.256.tar.xz +3a43df23adf3b759211444a1dbffd530b9de996584ad5fba324925c914bca7c6 linux-5.4.257.tar.gz +2e775970521ea7ff6eb613fc85a6e34cec73feaeb67b88a77a2fbd4f75483df0 linux-5.4.257.tar.xz b7feea0a1d505f26098d596e6ad6a2e8b476c8f63c52eabf435deab2bb9a5559 linux-5.5.tar.gz a6fbd4ee903c128367892c2393ee0d9657b6ed3ea90016d4dc6f1f6da20b2330 linux-5.5.tar.xz 8ad23faa72b6a22e3701b90485c0a60c75bd4226c0a438d9cc15e6eb0da2a665 linux-5.5.1.tar.gz @@ -2197,6 +2203,10 @@ d419989af291da0d9098e2dd8afda5c60f183c55a81822f20bf5887d150f1622 linux-5.10.194 240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995 linux-5.10.194.tar.xz a3f753e8774e78ded7b0bffa241152024a6eb24f2c707e00b8058563a4ec7c06 linux-5.10.195.tar.gz 413bee4adc71a104b998abe8ffd8403a41edf9f634ab82bee509619da2789b58 linux-5.10.195.tar.xz +00db84bc0f3f4d46568ba1b80a9503b887f0db56edddf1d4a3d355db67a1e0b7 linux-5.10.196.tar.gz +71ec2e3af082bcd7c4aac4b8ecdbc2e47695befe4984e3e5567791a605a96fc0 linux-5.10.196.tar.xz +439dc6bd6313f1077ba3243c28b878c6e73fcadd354a8289e0f2dd949241dee5 linux-5.10.197.tar.gz +183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab linux-5.10.197.tar.xz 8e7f07e91e9aa0611b749fd1a908dc9d28c7d612f831e9d273427d4442b55f25 linux-5.11.tar.gz 04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 linux-5.11.tar.xz 13c77074922003f9c456dec532020067358849a54877d8bca68157b1a5feb5f7 linux-5.11.1.tar.gz @@ -2633,6 +2643,8 @@ ab464e4107329ff5262f1c585c40fc29dc68f17687a9a918f3e90faba5303d62 linux-5.15.130 997c3391f439fb6fe32f1938fe089a046b840a5cde9a2215b6745144f8b24c69 linux-5.15.131.tar.xz b6e864da04436d35bcdafbfd3546c67691488c479e8890b09c614e3b9f2dd44a linux-5.15.132.tar.gz 4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac linux-5.15.132.tar.xz +ba1965b132c2a20ec7daea0c2fba1502f7b528397cb328daaa62ca7c65180090 linux-5.15.133.tar.gz +ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz d4791f2eddeb25c4e6ae0b2f9b3f5fb3fd394d7f9a57fa3e33de6dd9761480f6 linux-5.16.tar.gz 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz 5c91875fd84393b6a8a6352f5f7a2fedbed3708e06dc8cc465a9f5a86d1324f5 linux-5.16.1.tar.gz @@ -3127,6 +3139,7 @@ f3e6559d83083ae0b7a2cc432974774ce2eaeda22296935667168518aeae77c1 patch-5.4.250. e45c5f578d73ed3caf8959f97371a62ce93211a8fc9bbfbe731284fa7bd74dfe patch-5.4.254.xz 908d941b0af50f6905b758ff1684228c9b52228355e459760e74c69af291bdea patch-5.4.255.xz 721df9dbdf9f8133e496cbedff9565e825be388e07dd8b6a8c05464b22388056 patch-5.4.256.xz +887e073475597edad9d3423ac08c47a073b0f1cb3e3d47b7e9949fc597b15955 patch-5.4.257.xz e082f16aa710285ada2c1376b5509bb3bd49548b60ffca84605ac632caa990db patch-5.5.xz db575e6dfabeb2ab409e2c56f826a6d52d56b8a3b0c004ae261cabd5af220688 patch-5.5.1.xz 07cbd21a049b0bf5a96d7e0b8272db8e53e9947f0eff06fa2a765bb3b34bc8fa patch-5.5.2.xz @@ -3419,6 +3432,8 @@ c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098 patch-5.10.181 aff0670a8bfc7e648510640e9a7c26c60f3357b66a1d8ce39dbca1015734ca3c patch-5.10.193.xz 01091c143691b4063b630d284d77bd2840fe2a85194c8bbbfb6523d0740852f7 patch-5.10.194.xz ef349aa1f434b381599f0910c1399ee30da64e6e99d304de0696276ebc79b6db patch-5.10.195.xz +8bcc4b46e0d4f621d4d31f35a979cc2dc41237dbe15e901897b363fb371e9210 patch-5.10.196.xz +b2e3ed4eebcadaf06038937adfad7a1921f2d0b250c45cf3dc568ad93d796334 patch-5.10.197.xz 5b2710f30dd7b0c6f886a2042a76a4e640d3a690a57817d6ac3da49d5e1d96e9 patch-5.11.xz 8808ee2c7e904f2fb3c830b41c8bbc2b2ad37638ee95fdfde68167f0be35dd3f patch-5.11.1.xz 7a6d20308aed903a81a67e76e7c6cd294fb7cbb87f887e2168097da865def8ba patch-5.11.2.xz @@ -3637,6 +3652,7 @@ ea551fa64a48e34ba03e7349436a9bf998b19444845129819a6074d785892025 patch-5.15.125 49c64911f307ef7dfb09e98f547f08c1e23a0d5722bbf87e78882c5ab546d705 patch-5.15.130.xz 83c41f12a8e9a870a272a7b69eba21e1843df3a108029fdd45480ea3eae16df1 patch-5.15.131.xz 5817a2669b18da67e99a0d079347b8a4cca4c5e46b1e932e4fa56170604b3207 patch-5.15.132.xz +84e89fca135831bcfd64321bcc5e5619da130a3367a8713c84f37ba0ace4f9e9 patch-5.15.133.xz cdc44e99ee873ef2fe27f1ca62120ad225e8d59a99506db3ebfd31e0c7f6796b patch-5.16.xz 9ff97f3a01ec8744863ff611315c44c1f5d1ff551769f7d8359c85561dee1b1d patch-5.16.1.xz 3a09c2f1ad410c09cf03921abeed1a6ca7c38138fb508171ee673d429d179171 patch-5.16.2.xz @@ -3716,17 +3732,17 @@ fdabf20292982e808a26b87f2f29493ba9f20a87d958dc592018ba1a381669df patch-5.19.15. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJlCXlhAAoJEGMtOgZYnaaxjwYP/3/qiVo2O0uWbD/ac1sSJbIx -5ti7J67677YD3Js0tc0evVQKIk1fZjM2E5tDS5WtkCcWvdtyvBi/6idF76QW5+sZ -qw1H2qTLIr6Cc8/kCOgPfQzeZjngo9VgFXPm7cmY5s1WCP/De9ch8WhqJ/N/eIXJ -qyBOy8MLXsqYhu40k3a0epnlKA8JP2ZK8K4vmxxg37WyLQq+OfvmrWshPLRV+7ll -LgGp9rPNoK00IyBZR5dzIM2MAnmbdTYkEwVi0LVUHjvjnwuWicGzFN9vIwkP0rpu -n4Voenu+90DsKvtFggFA1OtiVcqP3wO3hmw2KRcEMneC7QCjoCth6J0KTO9IqLzx -x8qe8bNgPV8K3tt1xRDgLltlPOKszcf0EkqRlQv7FB9jhrC+G7DIYWZ7fEbB1Hkw -7ndqPUhJ4ZQ9S8c86ACOMETv23qP3BM4vmF3GuapZ4Yphhr4JGfCEyU6GZeIeNyo -13EB/mGiBBBSLmRMRZenW9YEYwa8iJf5vmwgTPbazcP8iqxS8GFPOd0gM3JoASBb -yHrONYCKc7+Fno3tML9pI8nMSKh3qwBhTfVeJ8QaZ5uQqYYRdVxF/NkXKr7O0bbk -959xL6HKMm+udmi31OnuRNL+69S/laEXYnrAfcdj4ENu35LBLaFWS00eIJHEbRd+ -S41PuaEDL8pXlNcfScXl -=YwUh +iQIcBAEBCAAGBQJlDq3NAAoJEGMtOgZYnaax/p0P/1lnvLtSDWBE7BuuOWLkdNdB +Tioc6QHVvC2k1mu6ZKGgmnJoN/au497vmiaNtyKHcsfLZtTzOOJh32U7buSO5gys +TSu67cceIa+4MR25Bgx6K9JyH/WMMFM4EcHmz0Q6svrCWDid+b4AIxgY6c3qSVaJ +01lkxX9xOSd6j+JuapigjLiCXPrJKwsOUNwyNVpRxgmUuOF6DK0+FPADMuVuRhIJ +zdW1ZeWs90WgVydG+9Q//Ug+LNXolybGkqjGskef9GCcxJmDPQAWJTXAF/Ww9p9y ++jCNjUfc2nHbssm9vOBVOJ4yi5Ha2Dpm+dfJJ/d1xjPcznnw9syMidM6m+wLpZ9x +B2ubNis66QKQyWJnH3v/uqtjkp3EFYzjE7jKnqBp4Z6SY5hdpj9VlREEjyndIp+J +YkvtOoKEqaouxU9Ip92dRaxwmn0UcK3xVAmMECeUlrCWBOmB38kZ2s4Q9CbTpWDy +664OAC4hTYXj2Zsi2W++WUPO2QlloWytGg3bkbJiahY2BY08rKVR7AWnmYV8N9p8 +NWIUvsDrMFmoj6IX9VWRpfAyByfAEp1mQvSZnoXjPeC6s53pW/S3dDrSB7Bq1X9/ +JE4q7gEqagCzoZi7tYhwH7thmyxbqCbh8kxIuK4bcklg4d5eMwIGM+lUu97GuHu+ +BY6BXQeyDNTx9HpLrlHK +=9Kun -----END PGP SIGNATURE----- diff --git a/man-db/PKGBUILD b/man-db/PKGBUILD index e60d3a3..2635bb7 100644 --- a/man-db/PKGBUILD +++ b/man-db/PKGBUILD @@ -6,12 +6,13 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=man-db -pkgver=2.11.2 +pkgver=2.12.0 pkgrel=01 pkgdesc="A utility for reading man pages w/o systemd" arch=('x86_64') #url="https://www.nongnu.org/man-db/" -url="https://gitlab.com/cjwatson/man-db" +#url="https://gitlab.com/cjwatson/man-db" +url="https://gitlab.com/man-db/man-db" depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less' 'libseccomp') makedepends=('po4a') optdepends=('gzip') # covered by virtual "base" package @@ -21,12 +22,12 @@ provides=('man') replaces=('man') #options=('debug') # uncomment this to have the man-db-debug pkg built install=${pkgname}.install -source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.asc} +#source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.asc}) +source=(https://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}) # fallback should be used within first 24h after a release #https://download-mirror.savannah.gnu.org/releases/man-db/$pkgname-$pkgver.tar.xz{,.asc} #snapdir.diff - convert-mans -) + #convert-mans) #prepare() { # cd ${pkgname}-${pkgver} @@ -64,9 +65,9 @@ package() { # part of groff pkg rm -f ${pkgdir}/usr/bin/zsoelim - # script from LFS to convert manpages, see - # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html - install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans +# # script from LFS to convert manpages, see +# # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html +# install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans } @@ -76,8 +77,11 @@ license=('GPL' 'LGPL') validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson -sha256sums=(cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d # man-db-2.11.2.tar.xz - 9ae5e922206cd905c64347437385026e70d0955d35222cde4c66f178790b2c3d # man-db-2.11.2.tar.xz.asc - affab3adc4b83d011ed83060d8ac579211c932e6c0900b92e12779c092ad5df3) # convert-mans +sha512sums=('4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf' + 'SKIP') +sha256sums=(415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95 # man-db-2.12.0.tar.xz + 3545558c85d4bd30d880e604e622efdff1d4b3b5e139474b667fc2c6f3c7ad06) # man-db-2.12.0.tar.xz.asc + +## 78b1efa3d4fd9588649aae06aa60e4c6d801f7b998c5bd5e747c31f63acf17a6 man-db-2.12.0-01-x86_64.pkg.tar.lz diff --git a/man-db/PKGBUILD-arch b/man-db/PKGBUILD-arch index c82c802..60d1b48 100644 --- a/man-db/PKGBUILD-arch +++ b/man-db/PKGBUILD-arch @@ -2,30 +2,27 @@ # Contributor: Sergej Pupykin pkgname=man-db -pkgver=2.11.2 +pkgver=2.12.0 pkgrel=1 pkgdesc="A utility for reading man pages" arch=('x86_64') -url="https://gitlab.com/cjwatson/man-db" +url="https://gitlab.com/man-db/man-db" license=('GPL' 'LGPL') -depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less' 'libseccomp') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less' 'libseccomp' 'glibc') makedepends=('po4a') optdepends=('gzip') # covered by virtual "base" package backup=('etc/man_db.conf') conflicts=('man') provides=('man') replaces=('man') -options=('debug') install=${pkgname}.install source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.asc} # fallback should be used within first 24h after a release #https://download-mirror.savannah.gnu.org/releases/man-db/$pkgname-$pkgver.tar.xz{,.asc} - convert-mans ) validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson -sha512sums=('edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391' - 'SKIP' - '0b159285da20008f0fc0afb21f1eaebd39e8df5b0594880aa0e8a913b656608b8d16bb8d279d9e62d7aae52f62cb9b2fc49e237c6711f4a5170972b38d345535') +sha512sums=('4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf' + 'SKIP') build() { cd ${pkgname}-${pkgver} @@ -55,10 +52,6 @@ package() { # part of groff pkg rm -f ${pkgdir}/usr/bin/zsoelim - # script from LFS to convert manpages, see - # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html - install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans - install -d -m755 ${pkgdir}/usr/lib/systemd/system/timers.target.wants ln -s ../man-db.timer ${pkgdir}/usr/lib/systemd/system/timers.target.wants/man-db.timer } diff --git a/man-db/deps b/man-db/deps index d799377..c51b37f 100644 --- a/man-db/deps +++ b/man-db/deps @@ -2,4 +2,3 @@ po4a libpipeline - diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 4f856be..9d14cdd 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pacman pkgver=6.0.2 -pkgrel=014 +pkgrel=015 pkgdesc="A library-based package manager with dependency support modified for joborun from arch" url="https://www.archlinux.org/pacman/" groups=(base jobbot) @@ -33,6 +33,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch + pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch + pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch pacman.conf makepkg.conf) @@ -64,21 +66,11 @@ build() { meson compile -C build } -# Run if you like, this is what we got -# Summary of Failures: -# -# 150/339 replace100.py FAIL 0.27s 0/1 subtests passed -# 207/339 sync046.py FAIL 0.35s 0/1 subtests passed -# 331/339 upgrade100.py FAIL 0.29s 0/1 subtests passed -# -# Ok: 329 -# Expected Fail: 7 -# Fail: 3 -# -# check() { -# cd "$pkgname-$pkgver" -# meson test -C build -# } +check() { + cd "$pkgname-$pkgver" + + meson test -C build +} package() { cd "$pkgname-$pkgver" @@ -107,7 +99,10 @@ sha256sums=(7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 # d2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114 # pacman-always-create-directories-from-debugedit-fixup.patch f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0 # pacman-fix-unique-source-paths.patch d87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312 # pacman-strip-include-o-files-similar-to-kernel-modules.patch + 8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1 # pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch + b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1 # pacman-fix-order-of-fakechroot-fakeroot-nesting.patch 6436e418557989586221d4d5c527666f18d98c6332126dbb6276581b9dce4f6d # pacman.conf - 57908e7e19d841e0be54f3024c3018ce3ed6de5ea1d7750bac550f3e1e90d8c7) # makepkg.conf + b7b3302848e12438b4767eafcc76e121b0f24717c37572e252ffcf4f36a5c4d9) # makepkg.conf + +## 3e50b6c757dae445d65793aa2fb47f34102737613d5e67a7e12ba90f6e903b1f pacman-6.0.2-015-x86_64.pkg.tar.lz -## 8a773978ec4fc0f9494c0501b9f4dcc002e6fdeafdc3a4ba017fc65180e22c99 pacman-6.0.2-014-x86_64.pkg.tar.lz diff --git a/pacman/PKGBUILD-arch b/pacman/PKGBUILD-arch index 8cfba72..86dc2de 100644 --- a/pacman/PKGBUILD-arch +++ b/pacman/PKGBUILD-arch @@ -1,10 +1,9 @@ -# vim: set ts=2 sw=2 et: # Maintainer: Levente Polyak # Maintainer: Morten Linderud pkgname=pacman pkgver=6.0.2 -pkgrel=7 +pkgrel=8 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -25,6 +24,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch + pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch + pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch pacman.conf makepkg.conf) sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' @@ -33,8 +34,10 @@ sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' 'd2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114' 'f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0' 'd87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312' + '8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1' + 'b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1' '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' - '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6') + 'b46bca4d3f8b41138923b7a1d7ada272b56ad8b89d0d6ce09145638bdf15185d') prepare() { cd "${pkgname}-${pkgver}" @@ -80,3 +83,5 @@ package() { install -m644 "$srcdir/pacman.conf" "$pkgdir/etc" install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" } + +# vim: set ts=2 sw=2 et: diff --git a/pacman/makepkg.conf b/pacman/makepkg.conf index 48c677e..457779a 100644 --- a/pacman/makepkg.conf +++ b/pacman/makepkg.conf @@ -23,7 +23,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' #-- The package required by makepkg to download VCS sources # Format: 'protocol::package' -VCSCLIENTS=('bzr::bzr' +VCSCLIENTS=('bzr::breezy' 'fossil::fossil' 'git::git' 'hg::mercurial' @@ -163,6 +163,7 @@ SRCEXT='.src.tar.gz' # #-- Command used to run pacman as root, instead of trying sudo and su PACMAN_AUTH=(pkg) + # If you choose the default Joborun shell to be zsh check your # .zshrc either stored in your home from the Joborun tarball image # or the one proposed in the obarun-zsh pkg /etc/.zshrc or /etc/skel/.zshrc diff --git a/pacman/makepkg.conf-arch b/pacman/makepkg.conf-arch index f270d8e..b9e04eb 100644 --- a/pacman/makepkg.conf-arch +++ b/pacman/makepkg.conf-arch @@ -23,7 +23,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' #-- The package required by makepkg to download VCS sources # Format: 'protocol::package' -VCSCLIENTS=('bzr::bzr' +VCSCLIENTS=('bzr::breezy' 'fossil::fossil' 'git::git' 'hg::mercurial' diff --git a/pacman/pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch b/pacman/pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch new file mode 100644 index 0000000..a8fc873 --- /dev/null +++ b/pacman/pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch @@ -0,0 +1,43 @@ +From 0e938f188692c710be36f9dd9ea7b94381aed1b4 Mon Sep 17 00:00:00 2001 +From: Allan McRae +Date: Mon, 12 Dec 2022 18:37:59 +1000 +Subject: [PATCH] libmakepkg: fix compatibility with bash-5.2 + patsub_replacement + +Bash-5.2 introduced the patsub_replacement shell option, which is enabled +by default. Apparently is it supposed to handle a sed-like idiom, but +what it does achieve is making any substitution involving a "&" requiring +special care. + +For makepkg's DLAGENTS, we replace "%o" and "%u" if present. Any "&" in +the replacement fields triggers patsub_replacement unless quoted. This is +particularly important for the URL field. + +Add relevant quotes to avoid issues. + +Signed-off-by: Allan McRae +--- + scripts/libmakepkg/source/file.sh.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in +index fa09d4469..10e0026e4 100644 +--- a/scripts/libmakepkg/source/file.sh.in ++++ b/scripts/libmakepkg/source/file.sh.in +@@ -60,11 +60,11 @@ download_file() { + # replace %o by the temporary dlfile if it exists + if [[ ${cmdline[*]} = *%o* ]]; then + dlfile=$filename.part +- cmdline=("${cmdline[@]//%o/$dlfile}") ++ cmdline=("${cmdline[@]//%o/"$dlfile"}") + fi + # add the URL, either in place of %u or at the end + if [[ ${cmdline[*]} = *%u* ]]; then +- cmdline=("${cmdline[@]//%u/$url}") ++ cmdline=("${cmdline[@]//%u/"$url"}") + else + cmdline+=("$url") + fi +-- +GitLab + diff --git a/pacman/pacman-fix-order-of-fakechroot-fakeroot-nesting.patch b/pacman/pacman-fix-order-of-fakechroot-fakeroot-nesting.patch new file mode 100644 index 0000000..047e8e2 --- /dev/null +++ b/pacman/pacman-fix-order-of-fakechroot-fakeroot-nesting.patch @@ -0,0 +1,50 @@ +From 05f283b5ad8f5b8f995076e93a27c8772076f872 Mon Sep 17 00:00:00 2001 +From: Xiretza +Date: Sun, 17 Sep 2023 20:26:30 +0000 +Subject: [PATCH] tests: fix order of fakechroot + fakeroot nesting + +As noted in the fakechroot(1) man page, fakeroot and fakechroot +might wrap the same C library functions. Arch Linux hit this +recently with calls to stat(). It is important to start the fake +environment in proper order - fakeroot should be started inside +fakechroot. + +Signed-off-by: Allan McRae +--- + test/pacman/pmtest.py | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py +index 3de35c433..f3375e82b 100644 +--- a/test/pacman/pmtest.py ++++ b/test/pacman/pmtest.py +@@ -240,18 +240,20 @@ def run(self, pacman): + + cmd = [] + if os.geteuid() != 0: +- fakeroot = util.which("fakeroot") +- if not fakeroot: +- tap.diag("WARNING: fakeroot not found!") +- else: +- cmd.append("fakeroot") +- ++ # fakechroot must be called before fakeroot due to potential ++ # potential interactions when wrapping the same C functions + fakechroot = util.which("fakechroot") + if not fakechroot: + tap.diag("WARNING: fakechroot not found!") + else: + cmd.append("fakechroot") + ++ fakeroot = util.which("fakeroot") ++ if not fakeroot: ++ tap.diag("WARNING: fakeroot not found!") ++ else: ++ cmd.append("fakeroot") ++ + if pacman["gdb"]: + cmd.extend(["libtool", "execute", "gdb", "--args"]) + if pacman["valgrind"]: +-- +GitLab +