September 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] [PATCH] trans_release: do not error on STATE_IDLE
by Andrew Gregory 03 Mar '15

03 Mar '15

If a transaction were actually in STATE_IDLE, which it should never be, the handle would be stuck with a useless transaction and lock file that it can't remove. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/trans.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e5328c5..0c84bb0 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -222,7 +222,6 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) trans = handle->trans; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); - ASSERT(trans->state != STATE_IDLE, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); int nolock_flag = trans->flags & ALPM_TRANS_FLAG_NOLOCK; -- 1.9.1

2 1

[pacman-dev] [PATCH] sync_prepare: exclude removals from resolvedeps
by Andrew Gregory 03 Mar '15

03 Mar '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 44a0ba8..cf7f0a8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -402,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { alpm_list_t *resolved = NULL; - alpm_list_t *remove = NULL; + alpm_list_t *remove = alpm_list_copy(trans->remove); alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ -- 1.9.0

2 1

[pacman-dev] [PATCH] makepkg: do not eval dlcmd
by lolilolicon 07 Jan '15

07 Jan '15

Something like `source=('$pkgname-$pkgver.tar.gz')` in the PKGBUILD would "just work" with this eval. This could be a security issue since URLs are arbitrary external data. Instead, expand the dlagent command line into an array, replace the %o, %u place holders, and run the resultant command line as is. A shortcoming of this is the dlagent command line cannot have embedded spaces. If this turns out to be a problem, we can do an early eval before substituting %o and %u. --- scripts/makepkg.sh.in | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8e8a64c..a134453 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -288,12 +288,12 @@ get_protocol() { get_downloadclient() { local proto=$1 - # loop through DOWNLOAD_AGENTS variable looking for protocol + # loop through DLAGENTS variable looking for protocol local i for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" if [[ $proto = "$handler" ]]; then - local agent="${i##*::}" + local agent="${i#*::}" break fi done @@ -308,8 +308,7 @@ get_downloadclient() { # ensure specified program is installed local program="${agent%% *}" if [[ ! -x $program ]]; then - local baseprog="${program##*/}" - error "$(gettext "The download program %s is not installed.")" "$baseprog" + error "$(gettext "The download program '%s' is not installed.")" "$program" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PROGRAM fi @@ -342,15 +341,16 @@ download_file() { local proto=$(get_protocol "$netfile") # find the client we should use for this URL - local dlcmd - dlcmd=$(get_downloadclient "$proto") || exit $? + local -a cmdline + local IFS=' ' + cmdline=($(get_downloadclient "$proto")) || exit local filename=$(get_filename "$netfile") local url=$(get_url "$netfile") if [[ $proto = "scp" ]]; then # scp downloads should not pass the protocol in the url - url="${url##*://}" + url="${url#*://}" fi msg2 "$(gettext "Downloading %s...")" "$filename" @@ -359,20 +359,18 @@ download_file() { local dlfile="${url##*/}" # replace %o by the temporary dlfile if it exists - if [[ $dlcmd = *%o* ]]; then - dlcmd=${dlcmd//\%o/\"$filename.part\"} - dlfile="$filename.part" + if [[ ${cmdline[*]} = *%o* ]]; then + dlfile=$filename.part + cmdline=("${cmdline[@]//%o/"$dlfile"}") fi # add the URL, either in place of %u or at the end - if [[ $dlcmd = *%u* ]]; then - dlcmd=${dlcmd//\%u/\"$url\"} + if [[ ${cmdline[*]} = *%u* ]]; then + cmdline=("${cmdline[@]//%u/"$url"}") else - dlcmd="$dlcmd \"$url\"" + cmdline+=("$url") fi - local ret=0 - eval "$dlcmd >&2 || ret=\$?" - if (( ret )); then + if ! command -- "${cmdline[@]}" >&2; then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" plain "$(gettext "Aborting...")" -- 2.1.0

4 8

[pacman-dev] [PATCH 0/9] refactor ini/config parser
by Andrew Gregory 29 Dec '14

29 Dec '14

As the first step to back-end hook support, this patchset makes the ini parser suitable for sharing between alpm and pacman by moving all error handling from the ini parser to the _parse_directive callback. This involves: * moving debug output to the callback * allowing empty section names (alpm already rejects empty db names) * moving Include handling to the callback * notifying the callback of read errors In order to do that I also refactored the config callback to use only a single pass by storing repo information until alpm is initialized and using bitmasks instead of the ALPM_SIG_*_SET enums to handle siglevel inheritance. apg Andrew Gregory (9): conf.c: store repo settings in dedicated struct conf.c: use masks for siglevel inheritance conf.c: parse config in a single pass ini.c: remove final callback call ini.c: move Include parsing to conf.c ini.c: remove unnecessary helper function ini.c: remove empty section name restriction ini.c: remove useless key check ini.c: move error output into conf.c lib/libalpm/alpm.h | 3 - lib/libalpm/be_sync.c | 2 +- src/pacman/conf.c | 304 ++++++++++++++++++++++++++++---------------------- src/pacman/conf.h | 16 +++ src/pacman/ini.c | 147 ++++-------------------- 5 files changed, 208 insertions(+), 264 deletions(-) -- 1.9.2

3 22

[pacman-dev] [PATCH 1/4] makepkg: checkout a revision specified in SVN fragment in download_svn.
by Lukáš Jirkovský 17 Nov '14

17 Nov '14

Previously the sources were dowloaded in HEAD revision in the download_svn(). If a specific revision was requested in fragment, the code was updated to that revision in extract_svn(). However, because SVN is a centralized system, this means that the changed sources has to be downloaded again. By moving the fragment handling to download_svn(), we get the correct revision without having to download it later in extract_svn(). Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> --- scripts/makepkg.sh.in | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28e8e7a..aeb231a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -706,10 +706,23 @@ download_svn() { fi url=${url%%#*} + local ref=HEAD + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + ref="${fragment##*=}" + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" mkdir -p "$dir/.makepkg" - if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then + if ! svn checkout -r ${ref} --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" exit 1 @@ -717,7 +730,7 @@ download_svn() { elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" cd_safe "$dir" - if ! svn update; then + if ! svn update -r ${ref}; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" fi @@ -727,11 +740,6 @@ download_svn() { extract_svn() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -742,29 +750,8 @@ extract_svn() { pushd "$srcdir" &>/dev/null rm -rf "${dir##*/}" - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - ref="${fragment##*=}" - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - cp -a "$dir" . - if [[ -n ${ref} ]]; then - cd_safe "$(get_filename "$netfile")" - if ! svn update -r ${ref}; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - fi - fi - popd &>/dev/null } -- 1.8.5.1

7 28

[pacman-dev] [PATCH WIP] Allow pacman to be run as a non-root user
by William Giokas 15 Nov '14

15 Nov '14

In order to run pacman as a non-root user to install packages to non-system (somewhere in $HOME or something) it was required to fake your root status using fakeroot. This allows users to specify a config directive, `NoRoot` to tell pacman that it should not check for root privileges. There is also an option in makepkg to allow it to not use root, as otherwise it will call 'sudo' or 'su' when using pacman to install or remove installed packages. --- WIP. I'm intending to use pacman and makepkg as a manager for some game mods, and this was the only thing really holding it back. I had done some tests using fakeroot and other ways of getting around these checks, but this is something that I thought should really go into pacman. Will allow even more people to use things like pacman and PKGBUILDs for other things, like games and user packages. Might also let us do some testing without having to fake root. Because WIP I haven't added docs yet. Just thought I'd get someone to look this over because I generally don't code in C, and it probably is disgusting. It's really just a carbon copy of the checkspace stuff, except in util.c. Thanks for looking it over, and sorry in advance for it being horrible. Bill Giokas (kaictl) lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + scripts/makepkg.sh.in | 10 ++++++---- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 1 + src/pacman/util.c | 3 +++ 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b0adb95..10d38bb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -675,6 +675,9 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +int alpm_option_get_noroot(alpm_handle_t *handle); +int alpm_option_set_noroot(alpm_handle_t *handle, int noroot); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 0842d51..c9ad007 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -252,6 +252,12 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +int SYMEXPORT alpm_option_get_noroot(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->noroot; +} + int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb) { CHECK_HANDLE(handle, return -1); @@ -593,6 +599,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_noroot(alpm_handle_t *handle, int noroot) +{ + CHECK_HANDLE(handle, return -1); + handle->noroot = noroot; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 27241ea..650fe27 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -89,6 +89,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + int noroot; /* Don't check for root status when running */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file upgrade operations */ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c15..dda4644 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -77,6 +77,7 @@ NEEDED=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 +NOROOT=0 PKGFUNC=0 PKGLIST=() PKGVERFUNC=0 @@ -1005,7 +1006,7 @@ run_pacman() { else cmd=("$PACMAN_PATH" "$@") fi - if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then + if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]] && (( ! $NOROOT )); then if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else @@ -2584,9 +2585,9 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' - 'verifysource' 'version') + 'nocheck' 'nodeps' 'noextract' 'noprepare' 'noroot' 'nosign' 'pkg:' + 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' + 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -2601,6 +2602,7 @@ while true; do case "$1" in # Pacman Options --asdeps) ASDEPS=1;; + --noroot) NOROOT=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --needed) NEEDED=1;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f75f3a7..5bea270 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -491,6 +491,8 @@ static int _parse_options(const char *key, char *value, pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); } else if(strcmp(key, "CheckSpace") == 0) { config->checkspace = 1; + } else if(strcmp(key, "NoRoot") == 0) { + config->noroot = 1; } else if(strcmp(key, "Color") == 0) { if(config->color == PM_COLOR_UNSET) { config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; @@ -734,6 +736,7 @@ static int setup_libalpm(void) alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); + alpm_option_set_noroot(handle, config->noroot); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index e8cac50..a6a87a9 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -45,6 +45,7 @@ typedef struct __config_t { unsigned short logmask; unsigned short print; unsigned short checkspace; + unsigned short noroot; unsigned short usesyslog; unsigned short color; double deltaratio; diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..d10bc7d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -102,6 +102,9 @@ int trans_release(void) int needs_root(void) { + if(config->noroot == 1) { + return 0; + } switch(config->op) { case PM_OP_DATABASE: return 1; -- 1.9.0

4 4

[pacman-dev] [PATCH] makepkg: bzr: update existing sources in srcdir without removing them first.
by Lukáš Jirkovský 13 Nov '14

13 Nov '14

The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. This changes semantics a bit. Previously using "bzr revno" would obtain the revision of the working tree. After this change, it is necessary to use "bzr revno --tree" to achieve the same result. The reasoning behind this change is that "bzr pull" that was previously used actually altered the original clone, making it impossible to freely navigate through the history when the internet connection wasn't available. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> --- scripts/makepkg.sh.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7d3c28b..f0e19ed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -499,10 +499,11 @@ extract_bzr() { unset fragment fi + rev="last:1" if [[ -n $fragment ]]; then case ${fragment%%=*} in revision) - revision=("-r" "${fragment#*=}") + rev="${fragment#*=}" displaylocation="$url -r ${fragment#*=}" ;; *) @@ -517,10 +518,16 @@ extract_bzr() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "bzr" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && - ( cd "$repo" && bzr pull "$dir" -q --overwrite "${revision[@]}" ); }; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + if ! (bzr update -q -r "$rev" && bzr clean-tree -q --detritus --force); then + error "$(gettext "Failure while updating working copy of %s %s repo")" "${repo}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi + elif ! { bzr checkout "$dir" -r "$rev" --lightweight && + ( cd "$repo" && bzr pull "$dir" -q --overwrite -r "$rev" ); }; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "bzr" plain "$(gettext "Aborting...")" exit 1 -- 2.0.1

2 2

[pacman-dev] Pacman-4.2 release plans
by Allan McRae 17 Oct '14

17 Oct '14

Hi all, We release pacman-4.1 ages ago and there are many bug fixes sitting on master that I am too lazy to backport. So I would like to see a push towards pacman-4.2. I propose the following. 2014-08-01: Feature freeze 2014-08-15: Code freeze 2014-08-31: Release I have the glibc release scheduled for the end of July, so that is where the feature freeze comes from. We have a number of bugs in the tracker and patches in patchwork fixing bugs or providing some polishing that need dealt with. The two (or more) week gap before the code freeze is dedicated to dealing with those. In preparation, can bugs be filed for anything that needs done before 4.2? The major thing that I know needs finished is figuring out how to adjust databases that have packages installed using the old directory symlink method. Our current roadmap (with several bugs that will be pushed further back) is here: https://bugs.archlinux.org/roadmap/proj3 Cheers, Allan @Lukáš: note the VCS incremental builds is listed in the roadmap so your patches will be dealt with soon! @Andrew: Do you need your ini/config reading patches in, or would it be OK to hold back until the next release (which I intend to focus only on adding hooks support and call pacman-5.0).

4 4

[pacman-dev] [PATCH] doc/translation-help.txt: Remove link to tutorial on sarovar.org
by Miguel de Val-Borro 01 Oct '14

01 Oct '14

The website sarovar.org has been shut down and the tutorial is not relevant any more. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 1fdb6e0..52c1e89 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -12,9 +12,7 @@ http://www.transifex.net/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation work, as it describes many of the commands in more detail than I will here: -https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. In -addition, this site presents a small tutorial that I found useful: -http://oriya.sarovar.org/docs/gettext/[]. +https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. Translating Messages -- 2.1.1

1 0