- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] meson: add trailing slashes to directory components in configuration defines
by Eli Schwartz 11 Dec '18

11 Dec '18

This matches what we currently do in the autotools build configuration, and ensures that the default pacman-conf definitions for unspecified values consistently end with the trailing directory slashes. This has ramifications for thirdparty tools that up to now, have relied on this slash being there. Those tools should be fixed to prevent breaking when custom locations are set, but this is no reason not to fix it on our end as well. An extra trailng slash should never cause harm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 138a1934..0a710653 100644 --- a/meson.build +++ b/meson.build @@ -72,10 +72,10 @@ conf.set_quoted('LDCONFIG', LDCONFIG) conf.set_quoted('LIB_VERSION', meson.project_version()) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) -conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman')) -conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg')) +conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) +conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/')) conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log')) -conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg')) +conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) -- 2.20.0

1 0

[pacman-dev] [PATCH 1/2] meson: remove useless mkdir -p
by Eli Schwartz 10 Dec '18

10 Dec '18

directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index bfba56a5..b0697f78 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -11,8 +11,6 @@ libmakepkg_modules = [ { 'name' : 'util', 'has_subdir' : true }, ] -mkdir_p = 'mkdir -p $DESTDIR/@0@' - foreach module : libmakepkg_modules custom_target( 'libmakepkg_@0@'.format(module['name']), @@ -24,10 +22,5 @@ foreach module : libmakepkg_modules if module.get('has_subdir', false) subdir(module['name']) - path = join_paths(get_option('prefix'), - get_option('datadir'), - 'makepkg', - module['name']) - meson.add_install_script('sh', '-c', mkdir_p.format(path)) endif endforeach -- 2.20.0

1 1

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-81-gb67ec905
by Allan McRae 10 Dec '18

10 Dec '18

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 b67ec905205d96ca6801626a65149724f47f36f0 (commit) via 36a5069a599f2f7d10eb8ad1a2074581f33ff040 (commit) via f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 (commit) via 9f1b735d76d04665d6324e723e163a52ca27567c (commit) via 65e09705d3ad781fd41cf1996f2b60e2e2c1975b (commit) via f615f7bd5ae2764bd58e2947e0f33e75fa182078 (commit) from 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (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 b67ec905205d96ca6801626a65149724f47f36f0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 3 09:36:36 2018 -0500 Enable additional debug flags/logging with debugoptimized builds This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36a5069a599f2f7d10eb8ad1a2074581f33ff040 Author: Michael Straube <michael.straube(a)posteo.de> Date: Sun Dec 9 18:31:50 2018 +0100 scripts/library: fix typo in README Simply fix a typo: in written -> is written Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f28ddd9d93ba5e16848cc2ed85a38cec4d2f2b65 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:30 2018 -0800 check localdb before upgrading package Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#55534 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f1b735d76d04665d6324e723e163a52ca27567c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 27 23:00:36 2018 -0500 libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 65e09705d3ad781fd41cf1996f2b60e2e2c1975b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Dec 2 20:44:24 2018 -0500 Make `make distcheck` work when bash-completion is installed. bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f615f7bd5ae2764bd58e2947e0f33e75fa182078 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 3 15:00:40 2018 +1000 configure.ac: use $datarootdir instead of $prefix/share Even worse, makepkg-template ignored $prefix completely. ----------------------------------------------------------------------- Summary of changes: Makefile.am | 3 ++- configure.ac | 4 ++-- lib/libalpm/add.c | 2 +- meson.build | 2 +- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------ scripts/library/README | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + test/pacman/tests/replace-and-upgrade-package.py | 27 ++++++++++++++++++++++++ 17 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Enable additional debug flags/logging with debugoptimized builds
by Dave Reisner 10 Dec '18

10 Dec '18

This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8837816f..394bd1f5 100644 --- a/meson.build +++ b/meson.build @@ -211,7 +211,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype') == 'debug' +if get_option('buildtype').startswith('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.19.2

4 6

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

Para Aser finanzas chentepancho5(a)gmail.com

1 0

[pacman-dev] [PATCH] check localdb before upgrading package
by Andrew Gregory 04 Dec '18

04 Dec '18

Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#5554 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + .../tests/replace-and-upgrade-package.py | 27 +++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5a3e06b8..e415bb17 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -427,7 +427,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, ASSERT(trans != NULL, return -1); /* see if this is an upgrade. if so, remove the old package first */ - if((oldpkg = newpkg->oldpkg)) { + if(_alpm_db_get_pkgfromcache(db, newpkg->name) && (oldpkg = newpkg->oldpkg)) { int cmp = _alpm_pkg_compare_versions(newpkg, oldpkg); if(cmp < 0) { log_msg = "downgrading"; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index dbdb429e..90885015 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -148,6 +148,7 @@ pacman_tests = [ { 'name': 'tests/remove060.py' }, { 'name': 'tests/remove070.py' }, { 'name': 'tests/remove071.py' }, + { 'name': 'tests/replace-and-upgrade-package.py' }, { 'name': 'tests/replace100.py' }, { 'name': 'tests/replace101.py' }, { 'name': 'tests/replace102.py' }, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc0b4ec3..74c8f674 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -144,6 +144,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/replace-and-upgrade-package.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/replace-and-upgrade-package.py b/test/pacman/tests/replace-and-upgrade-package.py new file mode 100644 index 00000000..ef2152a7 --- /dev/null +++ b/test/pacman/tests/replace-and-upgrade-package.py @@ -0,0 +1,27 @@ +self.description = 'Simultaneously replace and upgrade a package' + +# replacement package +sp1 = pmpkg('foo1', '1-2') +sp1.replaces = ['foo=1-1'] +sp1.conflicts = ['foo=1-1'] +self.addpkg2db('sync', sp1) + +# upgrade package +sp2 = pmpkg('foo', '2-1') +self.addpkg2db('sync', sp2) + +# depend on upgraded package to pull it into transaction +sp3 = pmpkg('bar', '1-1') +sp3.depends = [ 'foo=2-1' ] +self.addpkg2db('sync', sp3) + +lp = pmpkg('foo', '1-1') +self.addpkg2db('local', lp) + +self.args = "-Su bar" + +self.addrule('PACMAN_RETCODE=0') +self.addrule('PKG_VERSION=foo1|1-2') +self.addrule('PKG_VERSION=foo|2-1') +self.addrule('PKG_VERSION=bar|1-1') +self.addrule('!PACMAN_OUTPUT=error') -- 2.19.1

3 4

[pacman-dev] [PATCH] libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes
by Eli Schwartz 04 Dec '18

04 Dec '18

Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index 68c48038..92031d43 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -38,7 +38,7 @@ check_software() { local ret=0 for func in ${executable_functions[@]}; do - $func + $func || ret=1 done return $ret diff --git a/scripts/libmakepkg/executable/ccache.sh.in b/scripts/libmakepkg/executable/ccache.sh.in index dafde076..6143fee2 100644 --- a/scripts/libmakepkg/executable/ccache.sh.in +++ b/scripts/libmakepkg/executable/ccache.sh.in @@ -31,7 +31,7 @@ executable_ccache() { if check_buildoption "ccache" "y"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/distcc.sh.in b/scripts/libmakepkg/executable/distcc.sh.in index b9883f6b..d3a8cc25 100644 --- a/scripts/libmakepkg/executable/distcc.sh.in +++ b/scripts/libmakepkg/executable/distcc.sh.in @@ -31,7 +31,7 @@ executable_distcc() { if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/fakeroot.sh.in b/scripts/libmakepkg/executable/fakeroot.sh.in index e22d9a96..56c1b3fd 100644 --- a/scripts/libmakepkg/executable/fakeroot.sh.in +++ b/scripts/libmakepkg/executable/fakeroot.sh.in @@ -31,7 +31,7 @@ executable_fakeroot() { if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/gpg.sh.in b/scripts/libmakepkg/executable/gpg.sh.in index c0f57013..139773ef 100644 --- a/scripts/libmakepkg/executable/gpg.sh.in +++ b/scripts/libmakepkg/executable/gpg.sh.in @@ -28,6 +28,8 @@ source "$LIBRARY/util/option.sh" executable_functions+=('executable_gpg') executable_gpg() { + local ret=0 + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" @@ -41,4 +43,6 @@ executable_gpg() { ret=1 fi fi + + return $ret } diff --git a/scripts/libmakepkg/executable/gzip.sh.in b/scripts/libmakepkg/executable/gzip.sh.in index 66748320..bb1626bc 100644 --- a/scripts/libmakepkg/executable/gzip.sh.in +++ b/scripts/libmakepkg/executable/gzip.sh.in @@ -31,7 +31,7 @@ executable_gzip() { if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in index d9967f45..d1433ffd 100644 --- a/scripts/libmakepkg/executable/pacman.sh.in +++ b/scripts/libmakepkg/executable/pacman.sh.in @@ -31,7 +31,7 @@ executable_pacman() { if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then if [[ -z $PACMAN_PATH ]]; then error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index a6b81db6..867dc928 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -31,7 +31,7 @@ executable_strip() { if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in index 527d6f22..46631f39 100644 --- a/scripts/libmakepkg/executable/vcs.sh.in +++ b/scripts/libmakepkg/executable/vcs.sh.in @@ -49,7 +49,7 @@ get_vcsclient() { printf "%s\n" "$client" } -check_vcs_software() { +executable_vcs() { local netfile all_sources all_deps deps ret=0 if (( SOURCEONLY == 1 )); then @@ -101,9 +101,3 @@ check_vcs_software() { return $ret } - -executable_vcs() { - if ! check_vcs_software; then - ret=1 - fi -} -- 2.19.2

2 1

[pacman-dev] [PATCH] configure.ac: use $datarootdir instead of $prefix/share
by Allan McRae 03 Dec '18

03 Dec '18

Even worse, makepkg-template ignored $prefix completely. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c369ca74..ba54c2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ AC_ARG_WITH(buildscript, # Help line for buildscript filename AC_ARG_WITH(makepkg-template-dir, AS_HELP_STRING([--with-makepkg-template-dir=name], [set the template dir used by makepkg-template]), - [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=/usr/share/makepkg-template]) + [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=${datarootdir}/makepkg-template]) # Help line for debug package suffix AC_ARG_WITH(debug-suffix, @@ -216,7 +216,7 @@ AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , - bashcompdir="${prefix}/share/bash-completion/completions") + bashcompdir="${datarootdir}/bash-completion/completions") # Check for libarchive PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , -- 2.19.1

1 0

[pacman-dev] [PATCH] Make `make distcheck` work again.
by Eli Schwartz 03 Dec '18

03 Dec '18

bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 85be82b4..1e9ee152 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ ACLOCAL_AMFLAGS = -I m4 --install AM_MAKEFLAGS = --no-print-directory # Make sure we test and build manpages when doing distcheck -DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version +DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \ + bashcompdir='$${prefix}/share/bash-completion/completions' # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README -- 2.19.2

2 2