diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2020-10-11 22:22:04 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2020-10-21 11:17:14 +1000 |
| commit | f76bd2c6c1b94792112d311ac53662d3d9b6821d (patch) | |
| tree | 557b89addf8ce669fdfbe8a03edc11b035271a80 | |
| parent | 406a37206f9afbc3731ac22eda5b45b5a15eddc5 (diff) | |
| download | pacman-f76bd2c6c1b94792112d311ac53662d3d9b6821d.tar.gz pacman-f76bd2c6c1b94792112d311ac53662d3d9b6821d.zip | |
makepkg: fix signing of source packages
In commit c6b04c04653ba9933fe978829148312e412a9ea7 the signing stage was
moved out of fakeroot, and thus into the main control flow instead of
create_{,src}package
While the function for signing binary packages has logic to build
and gpg-sign multiple filenames, the source package never got this
special treatment. This would be fine, except it uses the standard
variables to set define the filename... like ${fullver}, which is
usually set beforehand, but in this case is not. We don't define fullver
globally as it's an internal implementation detail, except by sheer
coincidence if PKGVERFUNC is false due to improperly guarded code.
Result: source packages didn't end up signed. Instead, we raised a logic
error:
==> WARNING: Failed to sign package file somepackage-.src.tar.gz.
==> ERROR: An unknown error has occurred. Exiting...
Instead, let's just build the version inline, since we only use it once.
Reported-by: GaKu999 <g4ku999@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3ed12eab..9fe2d2e7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1360,7 +1360,7 @@ if (( SOURCEONLY )); then if [[ $SIGNPKG = 'y' ]]; then msg "$(gettext "Signing package...")" - create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" + create_signature "$SRCPKGDEST/${pkgbase}-$(get_full_version)${SRCEXT}" fi msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" |