moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Allan McRae 2015-01-02 21:43:56 +10:00
parent f1e010a5a7 89b9e9d1dc
commit fafcbdeb8c
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/updpkgsums.sh.in
View File

@ -82,9 +82,6 @@ fi
export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX)
newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX)
# In case the eventual replacement fails, we don't want to leave behind
# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement
# succeeds.
trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT
newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums'
awk -v newsums="$newsums" ' awk -v newsums="$newsums" '
@ -100,8 +97,9 @@ awk -v newsums="$newsums" '
END { if (!w) print newsums } END { if (!w) print newsums }
' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD' ' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD'
# Replace the original buildfile. # Rewrite the original buildfile. Use cat instead of mv/cp to preserve
if ! mv -- "$newbuildfile" "$buildfile"; then # permissions implicitly.
if ! cat -- "$newbuildfile" >"$buildfile"; then
die "Failed to update %s. The file has not been modified." "$buildfile" die "Failed to update %s. The file has not been modified." "$buildfile"
fi fi

9
doc/PKGBUILD.5.txt
View File

@ -216,7 +216,7 @@ underscore and the architecture name e.g., 'checkdepends_x86_64=()'.
and are not utilized by pacman during dependency resolution. The format and are not utilized by pacman during dependency resolution. The format
for specifying optdepends is: for specifying optdepends is:
optdepends=('fakeroot: for makepkg usage as normal user') optdepends=('python: for library bindings')
+ +
Additional architecture-specific optdepends can be added by appending an Additional architecture-specific optdepends can be added by appending an
underscore and the architecture name e.g., 'optdepends_x86_64=()'. underscore and the architecture name e.g., 'optdepends_x86_64=()'.
@ -336,10 +336,9 @@ files into the packaging directory, with optional `prepare()`, `build()`, and
*package() Function*:: *package() Function*::
The `package()` function is used to install files into the directory that The `package()` function is used to install files into the directory that
will become the root directory of the built package and is run after all will become the root directory of the built package and is run after all
the optional functions listed below. When specified in combination with the optional functions listed below. The packaging stage is run using
the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage fakeroot to ensure correct file permissions in the resulting package.
will be limited to running the packaging stage. All other functions will All other functions will be run as the user calling makepkg.
be run as the user calling makepkg.
*prepare() Function*:: *prepare() Function*::
An optional `prepare()` function can be specified in which operations to An optional `prepare()` function can be specified in which operations to

2
etc/makepkg.conf.in
View File

@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o
# /usr/bin/lftpget -c # /usr/bin/lftpget -c
# /usr/bin/wget # /usr/bin/wget
#-- The the package required by makepkg to download VCS sources #-- The package required by makepkg to download VCS sources
# Format: 'protocol::package' # Format: 'protocol::package'
VCSCLIENTS=('bzr::bzr' VCSCLIENTS=('bzr::bzr'
'git::git' 'git::git'

2
scripts/makepkg.sh.in
View File

@ -1499,7 +1499,7 @@ check_pgpsigs() {
esac esac
errors=1 errors=1
else else
if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then if (( ${#validpgpkeys[@]} == 0 && !trusted )); then
printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$fingerprint" >&2 printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$fingerprint" >&2
errors=1 errors=1
elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then