[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-170-g0bc687e2
Allan McRae
allan at archlinux.org
Wed May 8 05:25:02 UTC 2019
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 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2 (commit)
via 9375f49865296f04bd51e5e39ddca863b67cbd6c (commit)
via 614ef781ebf8ef7ae116c26d419bc9002c162599 (commit)
via b93dfa935f900d884f14d5be8949dc0ae85f1692 (commit)
via a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d (commit)
via 583f3122ce3b98c384165d47c126aaa5c98ea392 (commit)
via 6911904a033c1494f32f438f2d5cac2dc5b1ee19 (commit)
via f2a7fb2b96dd76f48b7750d1edeb6a85b7006856 (commit)
via a8b3d1a62afaeee4f1586f6c463f6bf51f7a2d70 (commit)
via 915ac9ff9b112997bcdb14d7136f4862c9537a35 (commit)
from d37e6d40a19dadf41a223dcb1fde36c6fa622958 (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 0bc687e2e01f4e6e3f2a2f7ac10c7e1fdbaf5ba2
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue Apr 16 13:36:12 2019 -0400
makepkg: propagate error codes when package failed to sign correctly
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 9375f49865296f04bd51e5e39ddca863b67cbd6c
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue May 7 21:55:03 2019 -0400
libmakepkg: install pkg-config file
Since makepkg exports a public library of functions, other projects may
wish to use these functions. Highlights include parseopts or our
messaging functions.
Install a pkg-config file in order to let downstream users detect where
they can source the libmakepkg functionality. This is useful e.g. to
gracefully handle the case where a thirdparty project is configured and
installed into a different datarootdir from pacman, but still wants to
use the installed pacman's version of libmakepkg.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 614ef781ebf8ef7ae116c26d419bc9002c162599
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue Apr 16 13:12:39 2019 -0400
libmakepkg: fix missing or inaccurate interdependencies
When the executable checking was refactored into libmakepkg, it carried
with it, usage of $E_* error codes, which need to be declared from
error.sh but are only available when the parent program already sources
error.sh; additionally, message.sh was only loaded in a parent
library, but not where it was needed, and option.sh was often loaded
when it wasn't needed at all.
util.sh, meanwhile, has always depended on message.sh functions.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit b93dfa935f900d884f14d5be8949dc0ae85f1692
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Sat Apr 27 22:54:17 2019 -0400
scripts: protect against unintended glob matching in [[ ]] RHS
The right-hand side of the [[ ... = ... ]] keyword is an exception to
the general rule that quoting is unnecessary with [[
This is usually not a problem, e.g. in libmakepkg, lint_one_pkgname will
already fail if pkgname has an asterisk, but it certainly doesn't hurt
to be "more proper" and go with the spec; it is more dangerous in
repo-add, which can get caught in an infinite loop instead of safely
asserting there is no package named 'foo*'.
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 a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Tue May 7 20:39:40 2019 -0400
makepkg: use more schema.sh to clean the environment of special variables
Fixes "arch" and "checkdepends" never having been unset, fixes b2sums
(but not ${!b2sums_@}) being recently left out.
The "build" function used to be unset as well, explicitly unset it as a
function and do the same for other official functions as well.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 583f3122ce3b98c384165d47c126aaa5c98ea392
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Sun Apr 14 20:56:17 2019 -0400
meson: fix build of executables with nonstandard libarchive path
The libarchive header is used in alpm.h, and several binaries include
this header. This is noticeably a problem when using e.g. the musl-gcc
compiler which does not include /usr/include by default, and thus the
build system reports:
...../lib/libalpm/alpm.h:35:10: fatal error: archive.h: No such file or directory
More commonly, this will result in compiling against potentially the
wrong headers, if the libarchive installation picked up by pkg-config is
different from the one with headers in /usr/include, and /usr/include is
in the -isystem path.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 6911904a033c1494f32f438f2d5cac2dc5b1ee19
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Wed Apr 10 01:50:31 2019 -0400
makepkg: fix bash 5 compatibility when packaging symlinks to a directory
In commit b5191ea140386dd9b73e4509ffa9a6d347c1b5fa we moved to using
shell globbing to print package files for a couple of reasons including
reproducible packaging of .METADATA files.
Unfortunately, this only works reliably when the glob pattern does not
resolve to a symlinked directory due to a change in the bash 5.0
release. Note that the previous, desired behavior was rather to merely
refuse to recurse into symlinked directories, but due to an unrelated
issue, the symlink handling for globstar was reworked in a way that had
this side effect.
See https://lists.gnu.org/archive/html/bug-bash/2019-04/msg00015.html
for discussion; this may be fixed at some point, but bash 5.0 is broken
either way.
The appropriate way of handling this seems to be to use **/* to match
instead; this produces the same results on both bash 4 and bash 5, as
the ** matches any leading directory component (or none), and the *
matches any file, directory, or symlink to either one.
Fixes FS#62278
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit f2a7fb2b96dd76f48b7750d1edeb6a85b7006856
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: Fri Apr 5 00:02:51 2019 +0200
Fix clang 8 string-plus-int warnings
Clang 8 warns that adding a string to an integer does not append to
string. Indeed it doesn't, but that was not the intentetion. Use array
indexing as suggested by the compiler to silence the warning. There
should be no functional change.
Example of warning message:
alpm.c:71:54: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1);
~~~~~~~~~~~^~~
alpm.c:71:54: note: use array indexing to silence this warning
sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1);
^
& [ ]
1 warning generated.
commit a8b3d1a62afaeee4f1586f6c463f6bf51f7a2d70
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Sun Mar 31 12:15:40 2019 -0400
makepkg: correctly handle hg sources with updates on a non-default branch
The "tip" ref actually signifies the most recently updated branch. hg
does not support a default branch named anything other than "default",
except by creating a "@" bookmark. The correct way to explicitly update
to the default clone ref, is therefore to use one of these, rather than
"tip".
Fixes FS#62092
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 915ac9ff9b112997bcdb14d7136f4862c9537a35
Author: Eli Schwartz <eschwartz at archlinux.org>
Date: Sun Mar 31 12:13:20 2019 -0400
libmakepkg: fix migration to schema.sh for integsums
One of the callers was changed to use known_hash_algos, one was not.
Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
Signed-off-by: Allan McRae <allan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
doc/makepkg.8.asciidoc | 2 +-
lib/libalpm/alpm.c | 2 +-
meson.build | 2 ++
scripts/.gitignore | 1 +
scripts/Makefile.am | 8 ++++++--
scripts/libmakepkg.pc.in | 6 ++++++
scripts/libmakepkg/buildenv.sh.in | 5 -----
scripts/libmakepkg/executable.sh.in | 5 -----
scripts/libmakepkg/executable/ccache.sh.in | 1 +
scripts/libmakepkg/executable/checksum.sh.in | 1 +
scripts/libmakepkg/executable/distcc.sh.in | 1 +
scripts/libmakepkg/executable/fakeroot.sh.in | 2 +-
scripts/libmakepkg/executable/gpg.sh.in | 1 +
scripts/libmakepkg/executable/gzip.sh.in | 1 +
scripts/libmakepkg/executable/pacman.sh.in | 2 +-
scripts/libmakepkg/executable/strip.sh.in | 1 +
scripts/libmakepkg/executable/sudo.sh.in | 2 +-
scripts/libmakepkg/executable/vcs.sh.in | 3 ++-
scripts/libmakepkg/integrity/generate_signature.sh.in | 8 ++++++--
scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +-
scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +-
scripts/libmakepkg/source/git.sh.in | 2 +-
scripts/libmakepkg/source/hg.sh.in | 6 +++++-
scripts/libmakepkg/srcinfo.sh.in | 2 +-
scripts/libmakepkg/tidy/zipman.sh.in | 2 +-
scripts/libmakepkg/util/util.sh.in | 3 +++
scripts/makepkg.sh.in | 11 ++++++-----
scripts/meson.build | 6 ++++++
scripts/pacman-db-upgrade.sh.in | 2 +-
scripts/repo-add.sh.in | 4 ++--
src/pacman/conf.c | 4 ++--
35 files changed, 68 insertions(+), 40 deletions(-)
create mode 100644 scripts/libmakepkg.pc.in
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list