- Pacman-dev - lists.archlinux.org

[pacman-dev] Full pacman-5.0 freeze
by Allan McRae 26 Jan '16

26 Jan '16

We are now in a complete freeze. I intend to make the release before the end of the month. I have submitted strings for translation to Transifex, so no string changes can occur. I will accept bug fixes only. What I see that needs done before release: - document --hookdir in pacman.8. - mentioned what HookDir is overriding (system hook dir) in pacman-conf.8. - bash/zsh completion Allan

3 4

[pacman-dev] [PATCH] Create makepkg-template and system hook directories upon install
by Allan McRae 26 Jan '16

26 Jan '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f10d15..a676878 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,9 +51,10 @@ AM_PY_LOG_FLAGS = \ --bindir $(top_builddir)/src/pacman \ --bindir $(top_builddir)/scripts -# create the pacman DB and cache directories upon install +# create the pacman DB, cache, makepkg-template and system hook directories upon install install-data-local: - for dir in "$(DESTDIR)$(localstatedir)/lib/pacman" "$(DESTDIR)$(localstatedir)/cache/pacman/pkg"; do \ + for dir in "$(DESTDIR)$(localstatedir)/lib/pacman" "$(DESTDIR)$(localstatedir)/cache/pacman/pkg" \ + "$(DESTDIR)$(datarootdir)/makepkg-template" "$(DESTDIR)$(datarootdir)/libalpm/hooks"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -- 2.7.0

1 0

[pacman-dev] [PATCH] Add HookDir to example pacman.conf
by Allan McRae 26 Jan '16

26 Jan '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- etc/pacman.conf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index b891de1..53071e5 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -14,6 +14,7 @@ #CacheDir = @localstatedir@/cache/pacman/pkg/ #LogFile = @localstatedir@/log/pacman.log #GPGDir = @sysconfdir@/pacman.d/gnupg/ +#HookDir = @sysconfdir@/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -- 2.7.0

1 0

[pacman-dev] [PATCH 1/2] bash_completion: update makepkg completion
by Allan McRae 26 Jan '16

26 Jan '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bash_completion.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 224b8f9..c74106f 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -74,12 +74,13 @@ _makepkg() { local cur opts prev COMPREPLY=() _get_comp_words_by_ref cur prev - if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asdeps check clean config force geninteg help holdver ignorearch install - key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare - noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck - source syncdeps verifysource version' - 'A L R S c d e f g h i m o p r s') + if [[ $cur = -* && ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vhp]) ]]; then + opts=('allsource asdeps check clean cleanbuild config force geninteg help + holdver ignorearch install key log needed noarchive nobuild nocheck + nocolor noconfirm nodeps noextract noprepare noprogressbar nosign + packagelist printsrcinfo repackage rmdeps sign skipchecksums + skipinteg skippgpcheck source syncdeps verifysource version' + 'A C L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi true -- 2.7.0

1 1

[pacman-dev] [PATCH] makepkg.conf.5: document option arguments in DLAGENTS need spaces escaped
by Allan McRae 26 Jan '16

26 Jan '16

Fixes FS#43304. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ac5791f..e35eb8a 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -39,8 +39,9 @@ Options **DLAGENTS=(**\'protocol::/path/to/command [options]' ...**)**:: Sets the download agents used to fetch source files specified with a URL in the linkman:PKGBUILD[5] file. Options can be specified for each command as - well, and any protocol can have a download agent. Several examples are provided - in the default makepkg.conf. + well, and any protocol can have a download agent. Any spaces in option + arguments are required to be escaped to avoid being split. Several + examples are provided in the default makepkg.conf. + If present, `%u` will be replaced with the download URL. Otherwise, the download URL will be placed on the end of the command. If present, `%o` will -- 2.7.0

1 0

[pacman-dev] [PATCH] PKGBUILD.5: document split package depends are not used during packaging
by Allan McRae 26 Jan '16

26 Jan '16

makepkg only considers global {make,}depends when checking require packages are installed before building. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 4ff3b02..e410481 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -402,6 +402,11 @@ each split package's packaging function: `provides`, `conflicts`, `replaces`, `backup`, `options`, `install`, and `changelog`. +Note that makepkg does not consider split package `depends` when checking +if dependencies are installed before package building and with `--syncdeps`. +All packages required to make the package are required to be specified in +the global `depends` and `makedepends` arrays. + An optional global directive is available when building a split package: *pkgbase*:: -- 2.7.0

1 0

[pacman-dev] [PATCH] zsh_completion: add -q/--quiet for -Q/-S
by genml+pacman-dev＠thequod.de 26 Jan '16

26 Jan '16

From: Daniel Hahler <git(a)thequod.de> This should also be added for "-Fh", but that is missing completely in zsh_completion. 1: https://lists.archlinux.org/pipermail/pacman-dev/2015-November/020538.html Signed-off-by: Daniel Hahler <git(a)thequod.de> --- contrib/zsh_completion.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 0db26b2..58d409a 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -65,6 +65,7 @@ _pacman_opts_query_modifiers=( {-l,--list}'[List package contents]' {-m,--foreign}'[List installed packages not found in sync db(s)]' {-n,--native}'[List installed packages found in sync db(s)]' + {-q,--quiet}'[Show less information for query and search]' {-t,--unrequired}'[List packages not required by any package]' {-u,--upgrades}'[List packages that can be upgraded]' ) @@ -104,6 +105,7 @@ _pacman_opts_sync_modifiers=( {\*-i,\*--info}'[View package information]' {-l,--list}'[List all packages in a repository]' {-p,--print}'[Print download URIs for each package to be installed]' + {-q,--quiet}'[Show less information for query and search]' {\*-u,\*--sysupgrade}'[Upgrade all out-of-date packages]' {-w,--downloadonly}'[Download packages only]' {\*-y,\*--refresh}'[Download fresh package databases]' -- 2.6.4

3 3

[pacman-dev] [PATCH] makepkg: do not run prepare() and pkgver() with --repackage
by Allan McRae 26 Jan '16

26 Jan '16

Bug introduced with commit 8454daa7. Reported-by: Zuyi Hu <hzy068808(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 753621b..80b95f4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2192,28 +2192,30 @@ mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" -if (( NOEXTRACT && ! VERIFYSOURCE )); then - warning "$(gettext "Using existing %s tree")" "\$srcdir/" -elif (( !REPKG )); then - download_sources - check_source_integrity - (( VERIFYSOURCE )) && exit 0 # $E_OK +if (( !REPKG )); then + if (( NOEXTRACT && ! VERIFYSOURCE )); then + warning "$(gettext "Using existing %s tree")" "\$srcdir/" + else + download_sources + check_source_integrity + (( VERIFYSOURCE )) && exit 0 # $E_OK - if (( CLEANBUILD )); then - msg "$(gettext "Removing existing %s directory...")" "\$srcdir/" - rm -rf "$srcdir"/* - fi + if (( CLEANBUILD )); then + msg "$(gettext "Removing existing %s directory...")" "\$srcdir/" + rm -rf "$srcdir"/* + fi - extract_sources -fi + extract_sources + fi -if (( PKGVERFUNC )); then - update_pkgver - basever=$(get_full_version) - check_build_status -fi -if (( PREPAREFUNC )); then - run_prepare + if (( PKGVERFUNC )); then + update_pkgver + basever=$(get_full_version) + check_build_status + fi + if (( PREPAREFUNC )); then + run_prepare + fi fi if (( NOBUILD )); then -- 2.7.0

2 2

[pacman-dev] Fix/enforce PATH with makepkg (required for Python packages)
by Daniel Hahler 25 Jan '16

25 Jan '16

Usually Python packages use `python` in their PKGBUILD, which results in any activated virtualenv to be used, e.g. from `pep257`: ``` package() { cd "${srcdir}/${pkgname}-${pkgver}" python setup.py install --root="${pkgdir}" --optimize=1 install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE-MIT } ``` Activating a virtualenv will add the "python" binary in front of $PATH. I've reported this initially for pacaur at https://github.com/rmarquis/pacaur/issues/400, but it's a problem with makepkg after all. I am using this workaround in /etc/xdg/pacaur/config currently: PATH=/usr/bin:$PATH Cheers, Daniel.

2 4

[pacman-dev] [PATCH] Remove spacing when outputting package sizes
by Allan McRae 25 Jan '16

25 Jan '16

This spacing appears to have been added to align sizes. It sometimes worked... $ pacman -Si glibc | grep Size Download Size : 8.03 MiB Installed Size : 35.08 MiB And it sometimes failed... $ pacman -Si pacman | grep Size Download Size : 662.82 KiB Installed Size : 4045.00 KiB Remove the spaces for a consistent output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/package.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 23dfc27..ac47493 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -275,10 +275,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_DOWNLOAD_SIZE], + printf("%s%s%s %.2f %s\n", config->colstr.title, titles[T_DOWNLOAD_SIZE], config->colstr.nocolor, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_COMPRESSED_SIZE], + printf("%s%s%s %.2f %s\n", config->colstr.title, titles[T_COMPRESSED_SIZE], config->colstr.nocolor, size, label); } else { /* autodetect size for "Installed Size" */ @@ -286,7 +286,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label); - printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_INSTALLED_SIZE], + printf("%s%s%s %.2f %s\n", config->colstr.title, titles[T_INSTALLED_SIZE], config->colstr.nocolor, size, label); string_display(titles[T_PACKAGER], alpm_pkg_get_packager(pkg), cols); -- 2.7.0

1 1