- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] bump to latest version
by Fabian Bläse 26 Jul '19

26 Jul '19

This fixes a tracepath bug which caused IPv6 tracepaths to use a wrong IPv6 address. iputils now uses the meson build system. The build commands are adjusted accordingly. perl-sgmls doesn't seem to be necessary anymore. It therefore is removed from the build dependency list. Signed-off-by: Fabian Bläse <fabian(a)blaese.de> --- trunk/PKGBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 64a0ecb..7aed567 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -4,9 +4,9 @@ pkgname=iputils # Commit date + git rev-parse --short origin/master -_rev=f6aac8d -pkgver=20180629.${_rev} -pkgrel=4 +_rev=13e0084 +pkgver=20190709.${_rev} +pkgrel=1 pkgdesc="Network monitoring tools, including ping" arch=('x86_64') license=('GPL') @@ -14,7 +14,7 @@ url="http://www.skbuff.net/iputils/" groups=('base') depends=('openssl' 'libcap' 'libidn2') optdepends=('xinetd: for tftpd') -makedepends=('perl-sgmls' 'git' 'docbook-xsl') +makedepends=('meson' 'git' 'docbook-xsl') conflicts=('netkit-base' 'arping' 'netkit-tftpd') replaces=('netkit-base') backup=(etc/xinetd.d/tftp) @@ -27,14 +27,13 @@ sha1sums=('SKIP' build() { cd "${srcdir}/${pkgname}" - make USE_NETTLE=no USE_GNUTLS=no CCOPTOPT="$CFLAGS" - # fix perl-sgmls - sed -i -e 's#sgmlspl#sgmlspl.pl#g' "${srcdir}/${pkgname}/doc/Makefile" - make -C doc man + meson --prefix=/usr -DBUILD_RARPD=true . build + + ninja -C build } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}/build" install -dm755 "${pkgdir}"/usr/bin -- 2.22.0

2 2

[pacman-dev] Obscurity in pacman.conf.5 man page
by Mario Blättermann 05 Jul '19

05 Jul '19

Hello, I stumbled upon the following sentence in pacman.conf.5: repo-add /home/pkgs/custom.db.tar.gz /home/pkgs/*.pkg.tar.gz The above command will generate a compressed database named /home/pkgs/custom.db.tar.gz. Note that the database must be of the form defined in the configuration file and {ext} is a valid compression type as documented in repo-add(8). Although the example database name has the static extension ».gz« (which is currently used in Archlinux' Pacman), the following explanation mentions {ext} as a variable for the file extension. If this targets to use cases of Pacman in other distributions which possibly use a different extension, then the man page should explain this more detailed. Best Regards, Mario

3 6

[pacman-dev] [PATCH] libalpm: fix documentation for alpm_pkg_mtree_next
by morganamilo 03 Jul '19

03 Jul '19

libarchive uses 1 for EOF, not 0. Instead of using the actual ints, use libarchive's error codes. --- By the way, not familiar with doxygen. Is my wording fine or is there some built in "see also" functionality? diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ffb2ad96..ece894cf 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1326,7 +1326,8 @@ struct archive *alpm_pkg_mtree_open(alpm_pkg_t *pkg); * @param pkg the package that the mtree file is being read from * @param archive the archive structure reading from the mtree file * @param entry an archive_entry to store the entry header information - * @return 0 if end of archive is reached, non-zero otherwise. + * @return ARCHIVE_OK on success, ARCHIVE_EOF if end of archive is reached, + * otherwise an error occured (see archive.h). */ int alpm_pkg_mtree_next(const alpm_pkg_t *pkg, struct archive *archive, struct archive_entry **entry); -- 2.21.0

5 6

[pacman-dev] [PATCH] doc: Add a man page describing PKGINFO
by Jelle van der Waa 01 Jul '19

01 Jul '19

From: Jelle van der Waa <jelle(a)archlinux.org> Describe the PKGINFO format which resides in a package produced makepkg. --- doc/Makefile.am | 4 +- doc/PKGINFO.5.asciidoc | 86 ++++++++++++++++++++++++++++++++++++++++++ doc/meson.build | 1 + 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 doc/PKGINFO.5.asciidoc diff --git a/doc/Makefile.am b/doc/Makefile.am index 5c575832..634388e8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,7 +16,8 @@ MANPAGES = \ pacman.conf.5 \ libalpm.3 \ BUILDINFO.5 \ - pacman-conf.8 + pacman-conf.8 \ + PKGINFO.5 DOXYGEN_MANS = $(wildcard man3/*.3) @@ -47,6 +48,7 @@ EXTRA_DIST = \ makepkg.conf.5.asciidoc \ pacman.conf.5.asciidoc \ BUILDINFO.5.asciidoc \ + PKGINFO.5.asciidoc \ libalpm.3.asciidoc \ footer.asciidoc \ index.asciidoc \ diff --git a/doc/PKGINFO.5.asciidoc b/doc/PKGINFO.5.asciidoc new file mode 100644 index 00000000..2da25c5b --- /dev/null +++ b/doc/PKGINFO.5.asciidoc @@ -0,0 +1,86 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +PKGINFO(5) +========== + +Name +---- +PKGINFO - package information file + + +Synopsis +-------- +This manual page describes the format of a PKGINFO file found in the root of +a package created by makepkg. The file contains a description of the package's +information. The information is formatted in key-value pairs separated by +a '=', one value per line. Arrays are represented multiple keys with the same +value. + + +Description +----------- + +*pkgname*:: + The name of the package. + +*pkgbase*:: + The base name of a package, usually the same as the pkgname except for + split packages. + +*pkgver*:: + The version of the package including pkgrel and epoch. + +*pkgdesc*:: + A description of the package. + +*url*:: + The upstream of the package. + +*builddate*:: + The build date of the package in epoch. + +*packager*:: + The packager of the package formatted Foo <foo(a)bar.com>. + +*size*:: + The size of the package. + +*arch*:: + The architecture of the package. + +*license*:: + The license of the package. + +*replaces (array)*:: + An array of packages this package should replace. + +*group (array)*:: + An array of symbolic names that represent groups of packages. + +*conflict (array)*:: + An array of packages that will conflict with this package. + +*provides (array)*:: + An array of "virtual provisions" this package provides. + +*backup (array)*:: + An array of file names. + +*depend (array)*:: + The dependencies of the package. + +*optdepend (array)*:: + The optional dependencies of the package. + +*makedepend (array)*:: + The make dependencies of the package. + +*checkdepend (array)*:: + The check dependencies of the package. + +See Also +-------- +linkman:makepkg[8], linkman:pkgbuild[5] + +include::footer.asciidoc[] diff --git a/doc/meson.build b/doc/meson.build index a5bcd5b3..2f966616 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -12,6 +12,7 @@ manpages = [ { 'name': 'libalpm.3' }, { 'name': 'BUILDINFO.5' }, { 'name': 'pacman-conf.8' }, + { 'name': 'PKGINFO.5' }, ] sitepages = [ -- 2.22.0

4 5

[pacman-dev] [PATCH] src/pacman/po/de.po: Missing whitespace
by Florian Knodt 30 Jun '19

30 Jun '19

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 src/pacman/po/de.po: Missing whitespace German translation for "installing x breaks dependency y required by z" is missing a whitespace character. Signed-off-by: Florian Knodt <adlerweb(a)adlerweb.info> - --- src/pacman/po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index 24cc413f..074176ee 100644 - --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -1550,7 +1550,7 @@ msgstr "Unerfüllbare Abhängigkeit '%s', benötigt von %s\n" #: src/pacman/sync.c:724 #, c-format msgid "installing %s (%s) breaks dependency '%s' required by %s\n" - -msgstr "Installation von%s (%s) verletzt Abhängigkeit '%s', benötigt von %s\n" +msgstr "Installation von %s (%s) verletzt Abhängigkeit '%s', benötigt von %s\n" #: src/pacman/sync.c:728 #, c-format - -- 2.22.0 -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEriS8bvu0c2IMqvEEfjx1LSYH85UFAl0X6AAACgkQfjx1LSYH 85VgqAgAjyeQLxB4VkJ0p50KqtDTHP+mehkuE156YrN5ympxCyA8ZTFqhHCDLV5k bN0p4iJD6ZEZYN9WZWVx/MBw+egh+kjnI5J0skwwEGGAbWUChQ1WwBxMjnitSxUS FZC1JWT7Lhs69SoXwvgeN/4Zeg+/HnuScYBrr6YVWYDTzqLS8iN+/hW5JtBqDrKW 5A1HqmT8tzOPD3enHIZhEphDedcyNsw2Um1aMFCQyjlxu1vPoB5XBgu/ZQJX3B/u uF2F0MaW3OwbknDgxelKH2pdKMIRccniW3DTUBKCtpd40hricmifwMk8RD8VasxK iYM15zbv/8L+HzqpGuHpc1U+HpndIw== =iJ0l -----END PGP SIGNATURE-----

2 1

[pacman-dev] [PATCH] Correctly report a download failiure for 404s
by morganamilo 28 Jun '19

28 Jun '19

Currently when caling alpm_trans_commit, if fetching a package restults in a 404 (or other non 400 response code), the function returns -1 but errno is never set. Thish patch sets errno to ALPM_ERR_RETRIEVE. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 05813c40..e5696bb0 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -454,6 +454,7 @@ static int curl_download_internal(struct dload_payload *payload, if(payload->respcode >= 400) { payload->unlink_on_fail = 1; if(!payload->errors_ok) { + handle->pm_errno = ALPM_ERR_RETRIEVE; /* non-translated message is same as libcurl */ snprintf(error_buffer, sizeof(error_buffer), "The requested URL returned error: %ld", payload->respcode); -- 2.21.0

2 1

[pacman-dev] [PATCH] bash-completion: use POSIX character classes in regular expressions
by Eli Schwartz 25 Jun '19

25 Jun '19

bash uses POSIX extended regular expressions via regex(3), which does not guarantee support for shorthand character classes. Although glibc supports it, msys2-runtime does not. Make sure the completion script works (hopefully) everywhere by being more portable. Fixes: https://github.com/msys2/MSYS2-packages/pull/1549 Original-patch-by: plotasse <platos(a)protonmail.ch> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/completion/bash_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index a1ab9fec..915004e2 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -24,7 +24,7 @@ _arch_ptr2comp() { } _arch_incomp() { - local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]] + local r="[[:space:]]-(-${1#* }[[:space:]]|[[:alnum:]_]*${1% *})"; [[ $COMP_LINE =~ $r ]] } _pacman_keyids() { @@ -77,7 +77,7 @@ _makepkg() { _init_completion || return if [[ $prev = @(-p|--config) ]]; then compopt -o default - elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then + elif [[ ! $prev =~ ^-(-(config|help|key|version)$|[[:alnum:]_]*[Vh]) ]]; 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 @@ -127,7 +127,7 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core - elif [[ ! $prev =~ ^-\w*[Vbhr] && + elif [[ ! $prev =~ ^-[[:alnum:]_]*[Vbhr] && ! $prev = --@(cachedir|color|config|dbpath|help|hookdir|gpgdir|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || -- 2.22.0

1 0

[pacman-dev] [PATCH 0/3] meson updates
by Eli Schwartz 25 Jun '19

25 Jun '19

Let's take advantage of the latest version of meson to make our meson.build smaller! New in 0.51 is also the dep.get_variable() function which is "a generic replacement for type specific variable getters" but I decided not to bother using it since it doesn't actually make get_pkgconfig_variable() shorter and the only benefit would be allowing us to also detect bash-completion using cmake (!!!) and there really is no need to pander to that. Eli Schwartz (3): meson: bump the minimum supported version of meson to 0.51 meson: use not_found_message when dependencies are not found meson: use dependency('gpgme') exclusively meson.build | 47 ++++++++++------------------------------------- meson_options.txt | 2 -- 2 files changed, 10 insertions(+), 39 deletions(-) -- 2.22.0

1 3

[pacman-dev] [PATCH] makepkg: do not exit immediately on dependency install failures
by Allan McRae 25 Jun '19

25 Jun '19

Fixes FS#63000 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..43484db3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -273,7 +273,7 @@ handle_deps() { if ! run_pacman -S --asdeps "${deplist[@]}"; then error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" - exit $E_INSTALL_DEPS_FAILED + return $R_DEPS_MISSING fi fi @@ -303,7 +303,7 @@ resolve_deps() { if handle_deps "${deplist[@]}"; then # check deps again to make sure they were resolved - deplist=$(check_deps "$@") || exit $E_INSTALL_DEPS_FAILED + deplist=$(check_deps "$@") [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi -- 2.22.0

2 1

[pacman-dev] [PATCH] makepkg: remove installed packages if installation of makedepends fails
by arch＠eckner.net 25 Jun '19

25 Jun '19

From: Erich Eckner <git(a)eckner.net> When makepkg fails to install makedepends=() or checkdepends=(), it should still remove installed depends=() packages iff RMDEPS is set. To correctly do this, it needs to remember the installed packages after successfully installing depends=(). Signed-off-by: Erich Eckner <git(a)eckner.net> --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..a6c94e97 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1366,6 +1366,10 @@ else msg "$(gettext "Checking runtime dependencies...")" resolve_deps ${depends[@]} || deperr=1 + if (( RMDEPS )); then + current_pkglist=($(run_pacman -Qq)) # required by remove_deps + fi + if (( RMDEPS && INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi -- 2.22.0

1 0