9c8d7a8093
In commit c6b04c0465 package signing was
moved out of fakeroot, and as part of this process, the global pkgname
variable was modified in order to extract the built package names.
However, if a debug package was not available and added to the list of
packages, the function was aborted early, before the pkgname array was
restored, thereby corrupting the later stages of makepkg and
specifically the install_package function which needs to know which
pkgnames to install.
Fix this by inlining the debug package signing inside the `if` check,
and as added security switch to using `for pkg in "${pkgname[@]}"` as is
done in many other parts of makepkg, since package signing does not
depend on the value of pkgname for anything.
Additionally, since debug packages may not actually exist, check if the
package file exists first.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
74 lines
2 KiB
Bash
74 lines
2 KiB
Bash
#!/bin/bash
|
|
#
|
|
# generate_signature.sh - functions for generating PGP signatures
|
|
#
|
|
# Copyright (c) 2008-2018 Pacman Development Team <pacman-dev@archlinux.org>
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
[[ -n "$LIBMAKEPKG_INTEGRITY_GENERATE_SIGNATURE_SH" ]] && return
|
|
LIBMAKEPKG_INTEGRITY_GENERATE_SIGNATURE_SH=1
|
|
|
|
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
|
|
|
source "$LIBRARY/util/message.sh"
|
|
|
|
create_signature() {
|
|
local ret=0
|
|
local filename="$1"
|
|
|
|
local SIGNWITHKEY=""
|
|
if [[ -n $GPGKEY ]]; then
|
|
SIGNWITHKEY="-u ${GPGKEY}"
|
|
fi
|
|
|
|
gpg --detach-sign --use-agent ${SIGNWITHKEY} --no-armor "$filename" &>/dev/null || ret=$?
|
|
|
|
|
|
if (( ! ret )); then
|
|
msg2 "$(gettext "Created signature file %s.")" "${filename##*/}.sig"
|
|
else
|
|
warning "$(gettext "Failed to sign package file.")"
|
|
fi
|
|
|
|
return $ret
|
|
}
|
|
|
|
create_package_signatures() {
|
|
if [[ $SIGNPKG != 'y' ]]; then
|
|
return 0
|
|
fi
|
|
local pkg pkgarch pkg_file
|
|
local fullver=$(get_full_version)
|
|
|
|
msg "$(gettext "Signing package(s)...")"
|
|
|
|
for pkg in "${pkgname[@]}"; do
|
|
pkgarch=$(get_pkg_arch $pkg)
|
|
pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}"
|
|
|
|
create_signature "$pkg_file"
|
|
done
|
|
|
|
# check if debug package needs a signature
|
|
if ! check_option "debug" "y" || ! check_option "strip" "y"; then
|
|
pkg=$pkgbase-@DEBUGSUFFIX@
|
|
pkgarch=$(get_pkg_arch)
|
|
pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}"
|
|
if [[ -f $pkg_file ]]; then
|
|
create_signature "$pkg_file"
|
|
fi
|
|
fi
|
|
}
|