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

[pacman-dev] [PATCH 1/1] makepkg: set umask 0022 again after syncing deps
by neindochoh.kraut+archmail＠mailbox.org 14 Mar '18

14 Mar '18

From: Felix Glaser <neindochoh.kraut(a)mailbox.org> makepkg configures the umask 0022 as a sane default for building packages. After installing dependencies, it sources `/etc/profile` again. If the user configured a umask other than Arch's default of 0022 (or 022) in `/etc/profile`, this sane default is now gone and needs to be set again. --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63b6c3e1..3bd018f2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -279,6 +279,10 @@ handle_deps() { shopt -u extglob source /etc/profile &>/dev/null eval "$shellopts" + + # umask might have been changed in /etc/profile + # ensure that sane default is set again + umask 0022 return $R_DEPS_SATISFIED } -- 2.16.2

2 1

[pacman-dev] [PATCH 0/3] Make documentation and PKGBUILD linting more consistent
by Rikard Falkeborn 14 Mar '18

14 Mar '18

Make the documentation a little more explicit about allowed characters for arch and pkgver. Also fix linting of pkgver which was broken if pkgver contained whitespace. Rikard Falkeborn (3): PKGBUILD.5: Mention valid characters for arch PKGBUILD.5: Mention that pkgver can't contain whitespace Fix linting of whitespace in pkgver doc/PKGBUILD.5.txt | 6 ++++-- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.16.2

2 5

[pacman-dev] [PATCH] makepkg: use localized date strings
by Chih-Hsuan Yen 14 Mar '18

14 Mar '18

From: Yen Chi Hsuan <yan12125(a)gmail.com> Before this change, LC_TIME=zh_TW.UTF-8 makepkg has the following line: ==> Making package: foobar 1-1 (日 2月 11 01:13:42 CST 2018) With this patch, this line becomes: ==> Making package: foobar 1-1 (西元2018年02月11日 (週日) 01時13分57秒) The latter is more natural for a Chinese native speaker. Signed-off-by: Chih-Hsuan Yen <yan12125(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 63b6c3e1..5e3af337 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1569,7 +1569,7 @@ if (( INFAKEROOT )); then exit $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date))" +msg "$(gettext "Making package: %s")" "$pkgbase $basever ($(date +%c))" # if we are creating a source-only package, go no further if (( SOURCEONLY )); then @@ -1597,7 +1597,7 @@ if (( SOURCEONLY )); then msg "$(gettext "Signing package...")" create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" - msg "$(gettext "Source package created: %s")" "$pkgbase ($(date))" + msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" exit $E_OK fi @@ -1703,7 +1703,7 @@ if (( NOARCHIVE )); then exit $E_OK fi -msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgbase $basever ($(date +%c))" install_package && exit $E_OK || exit $E_INSTALL_FAILED -- 2.16.1

4 9

[pacman-dev] [PATCH 0/1] bump AC_PREREQ to 2.64 on configure.ac
by Huáng Jùnliàng 14 Mar '18

14 Mar '18

*** BLURB HERE *** Huáng Jùnliàng (1): autoconf: bump AC_PREREQ to 2.64 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.1

2 2

[pacman-dev] [PATCH 0/1] Fix libarchive 2 compatibility
by Huáng Jùnliàng 14 Mar '18

14 Mar '18

*** BLURB HERE *** Huáng Jùnliàng (1): libalpm: use archive_write_finish for 2.x compat lib/libalpm/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.1

2 4

[pacman-dev] [PATCH] doc/.gitignore: ignore all manpages
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> They're all generated during make. --- I was going to add BUILDINFO.5 to the list, but this way covers future additions. doc/.gitignore | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/.gitignore b/doc/.gitignore index 186f45e4..a9736555 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,16 +1,4 @@ -alpm-hooks.5 -PKGBUILD.5 -libalpm.3 -makepkg.8 -makepkg-template.1 -makepkg.conf.5 -pacman.8 -pacman-key.8 -pacman.conf.5 -pkgdelta.8 -repo-add.8 -repo-remove.8 -vercmp.8 +*.[1-8] asciidoc-manpage.css asciidoc.css asciidoc.js -- 2.16.1

2 1

[pacman-dev] [PATCH] pacman-conf.c: exit if cannot set rootdir or parse config file
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> --- src/pacman/pacman-conf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 4ffa24a3..aa0cdf22 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -77,7 +77,11 @@ static void parse_opts(int argc, char **argv) config_file = optarg; break; case 'R': - config->rootdir = strdup(optarg); + if ((config->rootdir = strdup(optarg)) == NULL) { + fprintf(stderr, "error setting rootdir '%s': out of memory\n", optarg); + cleanup(); + exit(1); + } break; case 'l': repo_list = 1; @@ -105,6 +109,8 @@ static void parse_opts(int argc, char **argv) if(parseconfigfile(config_file) != 0 || setdefaults(config) != 0) { fprintf(stderr, "error parsing '%s'\n", config_file); + cleanup(); + exit(1); } } -- 2.16.1

2 1

[pacman-dev] [PATCH v4 1/2] pacman-conf.c: add short options
by iff＠escondida.tk 14 Mar '18

14 Mar '18

From: Ivy Foster <iff(a)escondida.tk> --- src/pacman/pacman-conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..ab73d896 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -42,13 +42,13 @@ static void usage(int ret) hputs("usage: pacman-conf [options] [<directive>...]"); hputs(" pacman-conf (--repo-list|--help|--version)"); hputs("options:"); - hputs(" --config=<path> set an alternate configuration file"); - hputs(" --rootdir=<path> set an alternate installation root"); - hputs(" --repo=<remote> query options for a specific repo"); - hputs(" --verbose always show directive names"); - hputs(" --repo-list list configured repositories"); - hputs(" --help display this help information"); - hputs(" --version display version information"); + hputs(" -c, --config=<path> set an alternate configuration file"); + hputs(" -R, --rootdir=<path> set an alternate installation root"); + hputs(" -r, --repo=<remote> query options for a specific repo"); + hputs(" -v, --verbose always show directive names"); + hputs(" -l, --repo-list list configured repositories"); + hputs(" -h, --help display this help information"); + hputs(" -V, --version display version information"); #undef hputs cleanup(); exit(ret); @@ -59,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = ""; + const char *short_opts = "c:hlR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, -- 2.16.1

3 3

[pacman-dev] [PATCH] Added gpg-agent.conf to disable the gnupg scdaemon This fixes an issue where smartcards, such a Yubikey, would cause the keyring to fail locally signing, thus also failing to verify signed packages.
by Eric Renfro 27 Feb '18

27 Feb '18

Signed-off-by: Eric Renfro <psi-jack(a)linux-help.org> --- scripts/pacman-key.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5bf6c7a1..72b64aa4 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -210,6 +210,12 @@ initialize() { add_gpg_conf_option "$conffile" 'lock-never' add_gpg_conf_option "$conffile" 'keyserver-options' 'timeout=10' + # gpg-agent.conf + agent_conffile="${PACMAN_KEYRING_DIR}/gpg-agent.conf" + [[ -f $agent_conffile ]] || touch "$agent_conffile" + chmod 644 "$agent_conffile" + add_gpg_conf_option "$agent_conffile" 'disable-scdaemon' + # set up a private signing key (if none available) if [[ $(secret_keys_available) -lt 1 ]]; then generate_master_key -- 2.16.2

1 0

[pacman-dev] [PATCH] Update doc gitignore
by Allan McRae 23 Feb '18

23 Feb '18

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/.gitignore b/doc/.gitignore index 186f45e4..912a37a7 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,5 +1,6 @@ alpm-hooks.5 PKGBUILD.5 +BUILDINFO.5 libalpm.3 makepkg.8 makepkg-template.1 -- 2.16.2

2 2