May 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: do not chmod $BUILDDIR itself after checking for its existence
by Eli Schwartz 31 May '18

31 May '18

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(a)archlinux.org> --- scripts/makepkg.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29413704..21737af8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1372,7 +1372,6 @@ if ! ensure_writable_dir "BUILDDIR" "$BUILDDIR"; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi -chmod a-s "$BUILDDIR" if (( ! (NOBUILD || GENINTEG) )) && ! ensure_writable_dir "PKGDEST" "$PKGDEST"; then plain "$(gettext "Aborting...")" -- 2.17.0

1 0

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: permit versioned optdepends
by Eli Schwartz 31 May '18

31 May '18

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(a)archlinux.org> --- doc/PKGBUILD.5.asciidoc | 5 +++-- .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index 9634bd15..ac26f3fe 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -212,8 +212,9 @@ underscore and the architecture name e.g., 'checkdepends_x86_64=()'. An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents of this package. optdepends are currently for informational purposes only - and are not utilized by pacman during dependency resolution. The format - for specifying optdepends is: + and are not utilized by pacman during dependency resolution. Packages in + this list follow the same format as depends, with an optional description + appended. The format for specifying optdepends descriptions is: optdepends=('python: for library bindings') + diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in index 87e561cb..9978fe9b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in @@ -31,15 +31,23 @@ lint_pkgbuild_functions+=('lint_optdepends') lint_optdepends() { - local a list name optdepends_list ret=0 - - local optdepends_list optdepend name ret=0 + local optdepends_list optdepend name ver ret=0 get_pkgbuild_all_split_attributes optdepends optdepends_list - for optdepend in "${optdepends_list[@]}"; do - name=${optdepend%%:[[:space:]]*} + # this function requires extglob - save current status to restore later + local shellopts=$(shopt -p extglob) + shopt -s extglob + + for optdepend in "${optdepends_list[@]%%:[[:space:]]*}"; do + name=${optdepend%%@(<|>|=|>=|<=)*} + # remove optional epoch in version specifier + ver=${optdepend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname optdepends "$name" || ret=1 + if [[ $ver != $optdepend ]]; then + # remove optional pkgrel in version specifier + check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" optdepends || ret=1 + fi done return $ret -- 2.17.0

1 0

[pacman-dev] [PATCH] libmakepkg: when checking for write permissions, handle pre-existing dirs
by Eli Schwartz 31 May '18

31 May '18

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(a)archlinux.org> --- scripts/libmakepkg/util/util.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index c2f9c624..e1ca5cb7 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -86,12 +86,12 @@ ensure_writable_dir() { local dirtype="$1" dirpath="$2" if ! mkdir -p "$dirpath" 2>/dev/null; then - if [[ -d $dirpath && ! -w $dirpath ]]; then - error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath" - else - error "$(gettext "Failed to create the directory \$%s (%s).")" "$dirtype" "$dirpath" - fi + error "$(gettext "Failed to create the directory \$%s (%s).")" "$dirtype" "$dirpath" + return 1 + elif [[ ! -w $dirpath ]]; then + error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath" return 1 fi + return 0 } -- 2.17.0

1 0

[pacman-dev] [PATCH] pacman-conf: fix detection of repo usage
by Allan McRae 29 May '18

29 May '18

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(a)archlinux.org> --- src/pacman/pacman-conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index aa0cdf22..baa72d97 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -212,9 +212,9 @@ static void show_siglevel(const char *directive, alpm_siglevel_t level, int pkgo } } -static void show_usage(const char *directive, alpm_db_usage_t usage) +static void show_usage(const char *directive, int usage) { - if(usage & ALPM_DB_USAGE_ALL) { + if(usage == ALPM_DB_USAGE_ALL) { show_str(directive, "All"); } else { if(usage & ALPM_DB_USAGE_SYNC) { -- 2.17.0

1 0

[pacman-dev] [PATCH] makepkg: update help text to describe --packagelist's new behavior
by Eli Schwartz 29 May '18

29 May '18

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(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 27245ea8..91ee5dd0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1180,7 +1180,7 @@ usage() { printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" - printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" + printf -- "$(gettext " --packagelist Only list package filenames that would be produced")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" -- 2.17.0

2 3

[pacman-dev] [PATCH] makepkg: remove unused variable forgotten when moving to parseopts
by Eli Schwartz 29 May '18

29 May '18

Reported-by: Rafael Ascensão <rafa.almas(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eec62de5..27245ea8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1287,7 +1287,7 @@ while true; do -h|--help) usage; exit $E_OK ;; -V|--version) version; exit $E_OK ;; - --) OPT_IND=0; shift; break ;; + --) shift; break ;; esac shift done -- 2.17.0

1 0

[pacman-dev] Order of repositories in `pacman.conf`
by Stefan Klinger 29 May '18

29 May '18

Hi, I only occasionally install individual packages from `testing` or `community-testing`, mostly if there's a bugfix that has not migrated to the stable repositories. However, if I just uncomment the relevant sections in `/etc/pacman.conf`, the command $ pacman -Syu will try to upgrade all installed packages to the versions from the testing repositories, because they come first. I was wondering whether it would be better to change the order of the repositories in `pacman.conf` to be # The testing repositories are disabled by default. To enable, uncomment the # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. [core] Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist #[testing] #Include = /etc/pacman.d/mirrorlist [community] Include = /etc/pacman.d/mirrorlist #[community-testing] #Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. #[multilib] #Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist Of course, this would make it less straight-forward for someone wanting to install a testing-only system, but is that a common use-case *except* for the developers? Just an idea... Cheers Stefan -- http://stefan-klinger.de o/X I prefer receiving plain text messages, not exceeding 32kB. /\/ \

4 3

[pacman-dev] Layout of package cache directory
by Stefan Klinger 29 May '18

29 May '18

Another question: I've been playing with using a network shared pacman cache as described in [1]. I've noticed that the serving machine will hold its own locally installed packages in `/var/cache/pacman/pkg/`, and the packages it caches in `/srv/http/pacman-cache`. These two directories have different layout, so it's not possible (I guess) to unify them. Would it make sense to change the directory structure of pacman's cache to be more like the one used by mirrors? Maybe it is possible to change the syntax of the `/etc/pacman.conf` to allow Server = /var/cache/pacman/pkg/$repo/os/$arch I think this should not be the default, but it would make a network-local cache leaner. ____________________ [1] https://wiki.archlinux.org/index.php/Pacman/Tips_and_tricks#Dynamic_reverse… -- http://stefan-klinger.de o/X I prefer receiving plain text messages, not exceeding 32kB. /\/ \

1 0

[pacman-dev] [PATCH] scripts/completion: derive the bash completion directory from pkg-config
by Eli Schwartz 29 May '18

29 May '18

Default to the standard completionsdir, which is lazy-loaded, rather than hardcoding the compatdir which is not. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- configure.ac | 3 +++ scripts/Makefile.am | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a820b6de..80aa2d3f 100644 --- a/configure.ac +++ b/configure.ac @@ -215,6 +215,9 @@ AM_GNU_GETTEXT_VERSION(0.13.1) 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") + # Check for libarchive PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , AC_MSG_ERROR([*** libarchive >= 3.0.0 is needed to compile pacman!])) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f759e149..f83e16c0 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -246,13 +246,18 @@ $(WRAPPER): \ $(AM_V_at)$(LN_S) $@ $(subst -wrapper,,$@) install-data-local: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ - $(INSTALL_DATA) completion/bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(MKDIR_P) $(DESTDIR)$(bashcompdir) + $(INSTALL_DATA) completion/bash_completion $(DESTDIR)/$(bashcompdir)/pacman + for completion in makepkg pacman-key; do \ + $(LN_S) pacman $(DESTDIR)/$(bashcompdir)/$$completion; \ + done $(MKDIR_P) $(DESTDIR)$(datarootdir)/zsh/site-functions/ $(INSTALL_DATA) completion/zsh_completion $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman uninstall-local: - $(RM) $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(RM) $(DESTDIR)$(bashcompdir)/makepkg + $(RM) $(DESTDIR)$(bashcompdir)/pacman + $(RM) $(DESTDIR)$(bashcompdir)/pacman-key $(RM) $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman install-exec-hook: -- 2.17.0

2 1

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, created. v5.1.0
by Allan McRae 27 May '18

27 May '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, release/5.1.x has been created at be4c491ceb34f04c3352ddd1d3c4672560e7ea8c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0