[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-19-g0d6e82d3
Allan McRae
allan at archlinux.org
Tue Jun 19 10:29:14 UTC 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The official pacman repository".
The branch, master has been updated
via 0d6e82d3748653a2b61ea34b940011ef97350768 (commit)
via d750c854bcfa2461742a4d5dff7b4747db5c1f53 (commit)
via 72263e22bdf2f33b2038f902612ac6a98954d254 (commit)
via a92a36070ad520afe45cb6dacf1de2f0caac612d (commit)
via 5cf6f614eb418a9e89c0cbfa5fbfac0d502ff668 (commit)
via 793202344b47914d06a2c48bacbb6b232f7c5387 (commit)
via e6dbe82c0c52011b4abb46283ba606eb75577ce7 (commit)
via 05a3641c76ba1c07dbec6fa1d9e9d3fcf6dec20c (commit)
via ab1e92860bdc5388621e8314b8e1652590fa2b05 (commit)
via b37a6063d0d37eb16465693439e3dfb92409e44a (commit)
via f78914cc6e3d431ec585c29e469a91121d90a5cf (commit)
via de8c5e78bbaec3aea16523d1a7c5cc6801154c80 (commit)
via 737596f038590878d9ac73e6e8de01ad22b2b340 (commit)
via 870d4c8fdd5e53c24c2a13cf1010b2536460fd8f (commit)
via c37a06fe1d1fbd2be73adc725323e8a4665eeb09 (commit)
via 9eb3695a3ff850b9dff66d667a4b27be1a233f42 (commit)
via 3a66b93be00b7a6b01a295bc203f91e663a133db (commit)
via 930d50194754e9c75bc0d6d7ccc41ae8f4b4e5c4 (commit)
via 716d776936a7c0559ef09a3b456fa52d2339a4aa (commit)
from be4c491ceb34f04c3352ddd1d3c4672560e7ea8c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d6e82d3748653a2b61ea34b940011ef97350768
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Thu Jun 14 22:25:25 2018 -0400
makepkg: don't print per-pkgname debug packages
In commit 9a4d61622066d5d30c649f1c958b26526a4ceddf debug packages were
merged into one exclusive pkgbase-debug, but the print_all_package_names
function did not get updated to match this logic.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit d750c854bcfa2461742a4d5dff7b4747db5c1f53
Author: Allan McRae <allan at archlinux.org>
Date: Mon Jun 18 16:50:58 2018 +1000
Fix signing of debug packages
Commit 9c8d7a80 broke the signing of debug packages by merging code up but
not changing the test condition.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 72263e22bdf2f33b2038f902612ac6a98954d254
Author: Michael Straube <straubem at gmx.de>
Date: Wed Jun 13 16:49:27 2018 +0200
libalpm/dload.c: fix filename in license header
The filename in the license header did not match the actual filename
as in the other files. Hopefully this is not too nit-picky.
Signed-off-by: Michael Straube <straubem at gmx.de>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit a92a36070ad520afe45cb6dacf1de2f0caac612d
Author: Dave Reisner <dreisner at archlinux.org>
Date: Sat Jun 9 15:24:42 2018 -0400
makepkg: fix initialization when extracting arrays
Assuming that everything is a string leads to code which is effectively:
a=
a+=('bar')
This creates an array with 2 elements instead of one. Using proper array
initialization fixes this.
https://lists.archlinux.org/pipermail/pacman-dev/2018-June/022591.html
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 5cf6f614eb418a9e89c0cbfa5fbfac0d502ff668
Author: morganamilo <morganamilo at gmail.com>
Date: Fri Jun 8 01:40:01 2018 +0100
Add missing sha224 sums in man page and linting
Signed-off-by: morganamilo <morganamilo at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 793202344b47914d06a2c48bacbb6b232f7c5387
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Mon Jun 4 09:31:19 2018 -0400
makepkg: fix erroneous $BUILDDIR when $startdir is not an absolute path
When comparing the $BUILDDIR to the $startdir, we used string equality
instead of testing whether they are the same location, and ended up
appending $pkgbase even though there's no reason to use it here.
In some cases, this could result in makepkg erroring when trying to
create $srcdir/$pkgdir, if a file with the same name as the $pkgbase
exists. This is expected behavior if a file "src" or "pkg" exists, but
decidedly less so for $pkgbase.
This could be fixed either by setting $startdir to an absolute path, or
by ensuring the test checks this directly; I've chosen to do both, since
the test should really be correctly checking the thing it actually cares
about, but since we ensure absolute paths are used everywhere else, this
might bite us elsewhere someday. It's also more consistent.
Fixes FS#58865
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit e6dbe82c0c52011b4abb46283ba606eb75577ce7
Author: Allan McRae <allan at archlinux.org>
Date: Mon Jun 4 22:44:01 2018 +1000
PKGBUILD.5: document restriction on pkgrel
The format of pkgrel was much more retrictive than described in the
man page. Update the documentation to reflect this.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 05a3641c76ba1c07dbec6fa1d9e9d3fcf6dec20c
Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
Date: Thu May 31 17:46:51 2018 +0200
makepkg: Don't use parameterless return
It's especially dangerous in trap handlers since the return value of the
function becomes the return value of the last command before the trap,
not the last command in the current function. This applies to any
function executed in a trap handler, nested functions included.
In one case, install_packages failed (via return 14), which was inside a
conditional that then ran exit 14, which triggered the EXIT handler,
which called clean_up, which called remove_deps, which had !RMDEPS and
thus returned. The return value of remove_deps became the return value
of install_packages, triggering the ERR handler, which (due to another
problem) was still the user function handler, which then printed a
misleading error message and overrode the exit code with 4.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit ab1e92860bdc5388621e8314b8e1652590fa2b05
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Sun Jun 3 01:31:17 2018 -0400
makepkg: fix the --nocolor option being broken when passed to pacman -U
In commit 8ff03868a37b1f9c447784ae2fd639a49e426399 PACMAN_OPTS was
turned into an array. Unfortunately, that array was generated by
treating the "--color never" option as one string, instead of an
array of two strings...
Fixes FS#58820
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit b37a6063d0d37eb16465693439e3dfb92409e44a
Author: Luke Shumaker <lukeshu at parabola.nu>
Date: Sun Jun 3 16:01:32 2018 -0400
pacman.conf: Fixup the XferCommand example for curl
1. Without `-L`, curl doesn't follow redirects. This is different than
both the default behavior of pacman, and from the wget example. So add
`-L`.
2. It uses `-C -` to supposedly allow resuming partial downloads; but that
doesn't work if we use `> %o` to direct the output to the file.
Instead, use `-o %o` so that `-C -` actually works.
Signed-off-by: Luke Shumaker <lukeshu at parabola.nu>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit f78914cc6e3d431ec585c29e469a91121d90a5cf
Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
Date: Thu May 31 18:24:54 2018 +0200
makepkg: Clear ERR trap before trying to restore it
$restoretrap is empty if the trap was not set. This caused the trap
handler to remain and override later exit codes.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit de8c5e78bbaec3aea16523d1a7c5cc6801154c80
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Thu May 31 20:31:23 2018 -0400
libmakepkg/lint_pkgbuild: squelch syntax error when a pkgname is empty
We fail with an error, but then we also fail with:
==> ERROR: depends is not allowed to be empty.
/usr/share/makepkg/lint_pkgbuild/pkgname.sh: line 39: continue: only meaningful in a `for', `while', or `until' loop
During the refactor to provide enhanced pkgname=pkgver linting, this was
moved out of the ${pkgname[@]} loop to a distinct function, at which
time it should have been modified to return rather than continue.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 737596f038590878d9ac73e6e8de01ad22b2b340
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Wed May 30 22:50:25 2018 -0400
makepkg: do not chmod $BUILDDIR itself after checking for its existence
In commit d8717a6a9666ec80c8645d190d6f9c7ab73084ac the write permission
checks were refactored. Initially we intended to drop this chmod in the
process, but due to some confusion about whether it was needed, I ended
up submitting patches both to preserve and to remove it... but it's not
needed after all. We do it on the individual $srcdir/$pkgdir, later on.
Then, we used the wrong version, which causes unnecessary restrictions.
See FS#58790
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 870d4c8fdd5e53c24c2a13cf1010b2536460fd8f
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Wed May 30 22:50:24 2018 -0400
libmakepkg/lint_pkgbuild: permit versioned optdepends
pacman accepts these, and there is no good reason to be more restrictive
ourselves; we should follow the example of "depends" here.
Update the documentation to actually state that this is supported.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit c37a06fe1d1fbd2be73adc725323e8a4665eeb09
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Wed May 30 22:50:23 2018 -0400
libmakepkg: when checking for write permissions, handle pre-existing dirs
Simplifies the function a bit, but mostly, mkdir -p will never fail if
the directory exists, and therefore makepkg never checks to see if it is
actually writable. On the other hand, it's unnecessary to check if the
directory exists once we know mkdir -p succeeded...
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 9eb3695a3ff850b9dff66d667a4b27be1a233f42
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue May 29 13:07:47 2018 -0400
makepkg: remove unused variable forgotten when moving to parseopts
Reported-by: Rafael Ascensão <rafa.almas at gmail.com>
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 3a66b93be00b7a6b01a295bc203f91e663a133db
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue May 29 13:05:18 2018 -0400
makepkg: update help text to describe --packagelist's new behavior
In commit d8591dd3418d55c5736022ef003891fc03b953e0 when teaching
--packagelist to print the full filepath for built arches only, I forgot
to update the helptext at the same time as I updated the manpage.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 930d50194754e9c75bc0d6d7ccc41ae8f4b4e5c4
Author: Allan McRae <allan at archlinux.org>
Date: Wed May 30 08:45:12 2018 +1000
pacman-conf: fix detection of repo usage
pacman-conf returned All for any repo Usage query because it was
checking if any repo options were enabled rather than if all options
were enabled.
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 716d776936a7c0559ef09a3b456fa52d2339a4aa
Author: Allan McRae <allan at archlinux.org>
Date: Mon May 28 13:47:36 2018 +1000
Apparently we live in the future!
Signed-off-by: Allan McRae <allan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
doc/PKGBUILD.5.asciidoc | 13 ++++++-----
doc/index.asciidoc | 2 +-
etc/pacman.conf.in | 2 +-
lib/libalpm/dload.c | 2 +-
.../libmakepkg/integrity/generate_signature.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 18 ++++++++++-----
scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 3 +--
scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 3 ++-
scripts/libmakepkg/util/pkgbuild.sh.in | 13 +++++++----
scripts/libmakepkg/util/util.sh.in | 10 ++++-----
scripts/makepkg.sh.in | 26 +++++++++++-----------
src/pacman/pacman-conf.c | 4 ++--
12 files changed, 57 insertions(+), 41 deletions(-)
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list