- Pacman-dev - lists.archlinux.org

[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] Parallel download patch
by lesto fante 14 Mar '18

14 Mar '18

Hello, I prepared a couple of alternative method to invoke parallel download but ONLY for external tool (xfer) and not for internal curl. I would like to have a feedback so I can eventually fix them. You can find patch file and explanation of the methodology used here; https://bugs.archlinux.org/task/20056?project=3

2 1

[pacman-dev] Does anybody look after the translation system?
by Ludvig Holtze 07 Mar '18

07 Mar '18

Hello! Since the Swedish translation of pacman is incomplete and incorrect in some places I tried to join the translation team two months ago. I haven't heard anything since then so I'm not sure if I've done something wrong or if nobody's simply noticed my request. Is it possible that someone could let me into the Swedish translation team? Kind regards, Ludvig Holtze (zeroxfourc on Transifex)

3 5

[pacman-dev] building pacman for a customer foloder
by pacman-dev 07 Mar '18

07 Mar '18

Hello Pacman Team, I was trying to build Pacman for installation into a custom folder. I downloaded the following pacman source code: https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz I then ran the following configure command: ./configure --prefix=/usr/local/pacman/ --disable-doc --disable-shared After this is seems to be using --prefix for make install but not when building. The binaries assume a location of /usr/local. See below for details. How do I build pacman to run from a custom directory? To make install I run $make $sudo mkdir /usr/local/pacman $sudo chown localuser:localuser /usr/local/pacman/ $make install At this point it has installed pacman executable at: $ls /usr/local/pacman/bin/pacman /usr/local/pacman/bin/pacman The configuration file can be found at $ls /usr/local/pacman/etc/pacman.conf /usr/local/pacman/etc/pacman.conf However when I run pacman I get an error, like the following: $ /usr/local/pacman/bin/pacman -U ~/mist.tar.gz error: config file /usr/local/etc/pacman.conf could not be read: No such file or directory If I go and link the file: $sudo ln -s /usr/local/pacman/etc/pacman.conf /usr/local/etc/ Then run pacman again I still get an error, just now with the var folder: $/usr/local/pacman/bin/pacman -U ~/mist.tar.gz error: failed to initialize alpm library (could not find or read directory: /usr/local/var/lib/pacman/) It seems to be taking the prefix for installation but not for compile. What do I need to change to make it run from a different prefix? Michael Power

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

[pacman-dev] [PATCH] makepkg: Don't interpret format specifiers in msg
by Niklas Holm 23 Feb '18

23 Feb '18

Message string containing for example windows paths would have unexpected behaviour. For example the message "Check C:\foo\bar" would be printed as "Check C:<newline> oar". Signed-off-by: Niklas Holm <jadedcyborg(a)gmail.com> --- scripts/libmakepkg/util/message.sh.in | 15 +++++---------- scripts/library/output_format.sh | 18 ++++++------------ 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/scripts/libmakepkg/util/message.sh.in b/scripts/libmakepkg/util/message.sh.in index 33808de7..90799640 100644 --- a/scripts/libmakepkg/util/message.sh.in +++ b/scripts/libmakepkg/util/message.sh.in @@ -44,26 +44,21 @@ colorize() { } plain() { - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BOLD} %s${ALL_OFF}\n" "$1" >&2 } msg() { - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${GREEN}==>${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } msg2() { - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BLUE} ->${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } warning() { - local mesg=$1; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } error() { - local mesg=$1; shift - printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } diff --git a/scripts/library/output_format.sh b/scripts/library/output_format.sh index 9f02c00b..2049aab3 100644 --- a/scripts/library/output_format.sh +++ b/scripts/library/output_format.sh @@ -1,32 +1,26 @@ plain() { (( QUIET )) && return - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${BOLD} %s${ALL_OFF}\n" "$1" >&1 } msg() { (( QUIET )) && return - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${GREEN}==>${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&1 } msg2() { (( QUIET )) && return - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${BLUE} ->${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&1 } ask() { - local mesg=$1; shift - printf "${BLUE}::${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}" "$@" >&1 + printf "${BLUE}::${ALL_OFF}${BOLD} %s${ALL_OFF}" "$1" >&1 } warning() { - local mesg=$1; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } error() { - local mesg=$1; shift - printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } -- 2.16.2

3 4

[pacman-dev] [PATCH v3 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- As per agregory's request in #archlinux-pacman, this version of the patch leaves the check for '?' well enough alone. '?' is getopt_long(3)'s way of indicating user error, and we can think of default: as indicating options forgotten in development. src/pacman/pacman-conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..3c9a80e2 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -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

2 7

[pacman-dev] [PATCH v2 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- This verion of the patch simply drops the check for '?', since it's caught by "default" anyway. The other patches are unchanged, except where rebased against this modified patch. src/pacman/pacman-conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..0f81ece6 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -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' }, @@ -96,7 +96,6 @@ static void parse_opts(int argc, char **argv) cleanup(); exit(0); break; - case '?': default: usage(1); break; -- 2.16.1

1 4