- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC PATCH] makepkg: add support for SAMUFLAGS, comparable to MAKEFLAGS
by Eli Schwartz 05 Aug '19

05 Aug '19

SAMUFLAGS is recently added to the samurai build tool, an implementation of the ninja build format (which is a competitor to Makefiles). Currently, samurai implements support for -v (verbose) and -j (configuring the number of parallel jobs) and rejects all other SAMUFLAGS. Adding SAMUFLAGS support to makepkg will allow users to configure how many jobs to use when building packages, which is an important consideration as the ninja build format is becoming fairly popular these days; meson uses it exclusively, cmake can optionally output it, and it can often speed up the time a build takes. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Support for SAMUFLAGS is only in git master. See https://github.com/michaelforney/samurai/pull/21 for discussion about its implementation. Submitting patch now for bikeshed purposes, but it "should" be safe to pull in as there will hopefully be a new samurai release in a week or two, and I expect this patch will take longer to review anyway, and even longer for pacman 5.2 :p Note: this overlaps with the RUSTFLAGS patch, and therefore depends on it. In the unlikely event that this patch gets accepted *first*, I can rebase it... doc/makepkg.conf.5.asciidoc | 9 +++++++-- etc/makepkg.conf.in | 1 + scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/buildenv/makeflags.sh.in | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 3f37190d..27e1162e 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -82,8 +82,13 @@ Options available linker flags. **MAKEFLAGS=**"makeflags":: - This is often used to set the number of jobs used; for example, `-j2`. - Other flags that make accepts can also be passed. + This is often used to set the number of jobs used in a Makefile; for + example, `-j2`. Other flags that make accepts can also be passed. + +**SAMUFLAGS=**"samuflags":: + This is often used to set the number of jobs used for the samurai build + tool; for example, `-j2`. Read linkman:samu[1] for more details on what + flags can be passed via `SAMUFLAGS`. **DEBUG_CFLAGS=**"debug_cflags":: Additional compiler flags appended to `CFLAGS` for use in debugging. Usually diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index caf5114b..c2cd55f9 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -43,6 +43,7 @@ CHOST="@CHOST@" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" +#SAMUFLAGS="-j2" #-- Debugging flags #DEBUG_CFLAGS="-g" #DEBUG_CXXFLAGS="-g" diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index 2ecd741e..fa9404d3 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -36,5 +36,5 @@ prepare_buildenv() { done # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS SAMUFLAGS CHOST } diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in index 74605c22..52b5aaa6 100644 --- a/scripts/libmakepkg/buildenv/makeflags.sh.in +++ b/scripts/libmakepkg/buildenv/makeflags.sh.in @@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_makeflags') buildenv_makeflags() { if check_option "makeflags" "n"; then - unset MAKEFLAGS + unset MAKEFLAGS SAMUFLAGS fi } -- 2.22.0

2 1

[pacman-dev] [PATCH] tolerate broken logpipe
by Yardena Cohen 05 Aug '19

05 Aug '19

Sometimes makechrootpkg fails with: rm: cannot remove '/logdest/logpipe.xxxxxxxx': No such file or directory This shouldn't cause the whole script to fail, so let's tolerate a missing pipe Signed-off-by: Yardena Cohen <yardenack(a)gmail.com> --- 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..9f8c9096 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -344,7 +344,7 @@ remove_deps() { error_function() { if [[ -p $logpipe ]]; then - rm "$logpipe" + rm -f "$logpipe" fi # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then @@ -428,7 +428,7 @@ run_function() { $pkgfunc &>"$logpipe" wait $teepid - rm "$logpipe" + rm -f "$logpipe" else "$pkgfunc" fi -- 2.22.0

4 4

[pacman-dev] [PATCH] makepkg: Ignore "<artificial>" source files
by Austin Lund 05 Aug '19

05 Aug '19

An artificial symbol can be produced when requesting debugging symbols and the compiler has inlined a function. These symbols will give spurious results when listing source files for inclusion in debug packages. This will ignore these symbols and avoid an error that can be generated when creating a debug package. Signed-off-by: Austin Lund <austin.lund(a)gmail.com> --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 5937e13c..5bc0a842 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -37,7 +37,7 @@ build_id() { source_files() { LANG=C readelf "$1" --debug-dump | \ - awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name !~ /^\//) {printf "%s/", $8}}{print name}}' + awk '/DW_AT_name +:/{name=$8}/DW_AT_comp_dir +:/{{if (name == "<artificial>") next}{if (name !~ /^[<\/]/) {printf "%s/", $8}}{print name}}' } strip_file() { -- 2.22.0

3 2

[pacman-dev] [PATCH 1/4] meson: drop checks for things we don't use
by Dave Reisner 05 Aug '19

05 Aug '19

This was ported over from the AC_CHECK_{FUNCS,HEADERS} lists in configure.ac, but I never actually checked if the resulting CPP defines are used. Turns out, lots of symbols, not a lot of define usage. --- meson.build | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/meson.build b/meson.build index 91f05031..c2ed707a 100644 --- a/meson.build +++ b/meson.build @@ -163,38 +163,13 @@ foreach header : [ endforeach foreach sym : [ - 'dup2', - 'fork', - 'getcwd', 'getmntent', 'getmntinfo', - 'gettimeofday', - 'memmove', - 'memset', - 'mkdir', - 'realpath', - 'regcomp', - 'rmdir', - 'setenv', - 'setlocale', - 'strcasecmp', - 'strchr', - 'strcspn', - 'strdup', - 'strerror', 'strndup', 'strnlen', - 'strnlen', - 'strrchr', - 'strsep', 'strsep', - 'strstr', - 'strtol', 'swprintf', 'tcflush', - 'tcflush', - 'uname', - 'wcwidth', ] have = cc.has_function(sym, args : '-D_GNU_SOURCE') conf.set10('HAVE_' + sym.to_upper(), have) -- 2.22.0

2 4

[pacman-dev] [PATCH 1/2] sighandler: block signals while handling SIGSEGV
by Andrew Gregory 05 Aug '19

05 Aug '19

If we get SIGSEGV we need to bail out quickly, leaving other signals unblocked could lead to other signal handlers getting triggered. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Signals are hard. I'd appreciate if somebody could double check my math on these patches. src/pacman/sighandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index ebcdebae..a4849a0c 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -96,7 +96,7 @@ void install_segv_handler(void) { struct sigaction new_action; new_action.sa_handler = segv_handler; - sigemptyset(&new_action.sa_mask); + sigfillset(&new_action.sa_mask); new_action.sa_flags = SA_RESTART; sigaction(SIGSEGV, &new_action, NULL); } -- 2.21.0

2 3

[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