diff --git a/bash-5.1-patches.tar.bz2 b/bash-5.1-patches.tar.bz2 index 24644a84..cdc9c2cc 100644 --- a/bash-5.1-patches.tar.bz2 +++ b/bash-5.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b65c32afbf861ea927e1e5cc3feec10c410cc2bd632b33300e4a825d73f4c271 -size 9715 +oid sha256:2c650b815eadbfdc0e4ac1ae4b7adddd679c6af91f5bab375f6e950c61f8d41f +size 11560 diff --git a/bash-5.1.tar.gz.sig b/bash-5.1.tar.gz.sig new file mode 100644 index 00000000..9be3964f Binary files /dev/null and b/bash-5.1.tar.gz.sig differ diff --git a/bash-rpmlintrc b/bash-rpmlintrc index 3dcea1a0..1986eb06 100644 --- a/bash-rpmlintrc +++ b/bash-rpmlintrc @@ -1,3 +1,4 @@ -addFilter(".*hidden-file-or-dir.*/etc/skel/\..*") +addFilter(".*shared-library-without-dependency-information.*") +addFilter(".*useless-provides.*") addFilter(".*zero-length.*/etc/skel/\..*") addFilter(".*call-to-mktemp.*/usr/bin/bash.*") diff --git a/bash.changes b/bash.changes index 4854716e..52ef3f89 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 24 08:17:32 UTC 2022 - Dr. Werner Fink + +- Add signatures files of the upstream patches as well + +------------------------------------------------------------------- +Wed Feb 23 16:49:10 UTC 2022 - Bernhard Wiedemann + +- Verify upstream release signatures + ------------------------------------------------------------------- Fri Jan 14 11:57:21 UTC 2022 - Dr. Werner Fink diff --git a/bash.keyring b/bash.keyring new file mode 100644 index 00000000..60d8a409 --- /dev/null +++ b/bash.keyring @@ -0,0 +1,25 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEEOsGwRBACFa0A1oa71HSZLWxAx0svXzhOZNQZOzqHmSuGOG92jIpQpr8Dp +vgRh40YpAwdcXb8QG1J5yGAKeevNE1zCFaA725vGSdHUyypHouV0xoWwukYO6qly +yX+2BZU+okBUqoWQkoWxiYaCSfzB2Ln7pmdys1fJhcgBKf3VjWCjd2XJTwCgoFJO +wyBFJdugjfwjSoRSwDOIMf0D/iQKqlWhIO1LGpMrGX0il0/x4zj0NAcSwAk7LaPZ +bN4UPjn5pqGEHBlf1+xDDQCkAoZ/VqESGZragl4VqJfxBr29Ag0UDvNbUbXoxQsA +Rdero1M8GiAIRc50hj7HXFoERwenbNDJL86GPLAQOTGOCa4W2o29nFfFjQrsrrYH +zVtyA/9oyKvTeEMJ7NA3VJdWcmn7gOu0FxEmSNhSoV1T4vP21Wf7f5niCCRKQLNy +Uy0wEApQi4tSysdz+AbgAc0b/bHYVzIf2uO2lIEZQNNt+3g2bmXgloWmW5fsm/di +50Gm1l1Na63d3RZ00SeFQos6WEwLUHEB0yp6KXluXLLIZitEJIheBBAWCAAGBQJa +Xm/3AAoJEBu4nAYCNnRJGPQBAM2cca3+cMUKWtSTxt4gYWBbV+ORFbJtbprOmukg +QNnEAQDrFDHtP9Wzo+R+0O7xUXjrkem0HcZmUKQPTim61wDRDbQaQ2hldCBSYW1l +eSA8Y2hldEBjd3J1LmVkdT6IZgQTEQIAHgUCQQ6wbAIbAwYLCQgHAwIDFQIDAxYC +AQIeAQIXgAASCRC7WGnwZOp0qwdlR1BHAAEBzs0An30UTMW8N1jOoJzNcXoopeLt +g3k4AJ9pwNiyhlyeezLsSMFkvTPAbBv+wbkBDQRBDrBvEAQAkK6TAOKBEM+EC4j6 +V/7o/riVZqcgU5cid2qG9TXdwNtD9a3kvA/ObZBO93sX59wc6Bnwo4VJxsOmMlpG +rAjJsxNwg3QHakEtf8LXRbVpj5xStdmBdQZUhIQyalo/2/TZq5OijtddUQcL5cs7 +0hTv/FpT3wUvr2Xr8rjF41IFEz8AAwcD/A0CZEGlzIrT5WCBnl6xBog/8vKiUCba +rByat3d1mL6DbizvKNXQRTC9E/vEdENAWCQCjr75Bu55xT8n3SXGtWdDC5xmZ/P3 +OBYORP8yl8H8I1FIosWOFirbIeYdZPq8SPD1HL+EXo9zSiHVrrZRJ19ooCKKbSdX +HFCY+aJG+0KZiFEEGBECAAkFAkEOsG8CGwwAEgkQu1hp8GTqdKsHZUdQRwABAeNw +AJ9mWRUIPBrP81M71zLe3r2halU83ACdHB7SqT9Yv+B+EffjrGHkHccVsU0= +=PsQ4 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/bash.spec b/bash.spec index 2cb42071..61b1732a 100644 --- a/bash.spec +++ b/bash.spec @@ -54,6 +54,9 @@ Source8: baselibs.conf # http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00071.html # http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00073.html Source9: bash-4.2-history-myown.dif.bz2 +Source10: https://ftp.gnu.org/gnu/bash/bash-%{bversion}%{bextend}.tar.gz.sig +# GPG key 7C0135FB088AAF6C66C650B9BB5869F064EA74AB Chet Ramey +Source11: bash.keyring Patch0: bash-%{bversion}.dif Patch1: bash-2.03-manual.patch Patch3: bash-4.3-2.4.4.patch @@ -227,8 +230,9 @@ echo -e '\033[1m\032[31mShift JIS support disabled\033[m' %setup -q -n bash-%{bversion}%{bextend} -b1 typeset -i level set +x -for patch in ../bash-%{bversion}-patches/*; do +for patch in ../bash-%{bversion}-patches/*-*[0-9]; do test -e $patch || break + let level=0 || true file=$(lsdiff --files=1 $patch) if test ! -e $file ; then diff --git a/get_version_number.sh b/get_version_number.sh index 31214a76..970174ce 100644 --- a/get_version_number.sh +++ b/get_version_number.sh @@ -7,9 +7,9 @@ version=$(sed -rn '/^%define[[:space:]]+bversion/{s/^%define[[:space:]]+bversion test -e ${sourcedir}/bash-${version}.tar.gz || exit 1 last=($(tar Oxf ${sourcedir}/bash-${version}.tar.gz bash-${version}/configure.ac | sed -rn '/^define.bashvers/{s/^define\(bashvers,[[:space:]]([0-9\.]+)\)/\1/p}')) || exit 1 test -e ${sourcedir}/bash-${version}-patches.tar.bz2 || echo ${last[0]} -tar --wildcards -tf ${sourcedir}/bash-${version}-patches.tar.bz2 '*/bash[0-9][0-9]-[0-9]*' &> /dev/null || echo ${last[0]} +tar --wildcards -tf ${sourcedir}/bash-${version}-patches.tar.bz2 '*/bash[0-9][0-9]-*[0-9]' &> /dev/null || echo ${last[0]} OFS="$IFS" IFS=- -last=($(tar -tf ${sourcedir}/bash-${version}-patches.tar.bz2 | sed -r 's@\.patch$@@'| sort -t '-' -k 3,3 -n | tail -n 1)) +last=($(tar --wildcards -tf ${sourcedir}/bash-${version}-patches.tar.bz2 '*/bash[0-9][0-9]-*[0-9]' | sed -r 's@\.patch$@@'| sort -t '-' -k 3,3 -n | tail -n 1)) IFS="$OFS" echo ${last[3]/*0/}