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

[pacman-dev] [PATCH] Fix crash when using external downloader
by Allan McRae 17 Nov '14

17 Nov '14

Commit 9d96bed9 attempts to use the same effective URL for the db and its signature download. However, this information is not available when we use an external downloader, resulting in a crash. Fall back to the old method when the effective URL is unavailable. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 62fd0f0..5245948 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -241,12 +241,25 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) unlink(sigpath); free(sigpath); - /* if we downloaded a DB, we want the .sig from the same server */ - /* print final_db_url into a buffer (leave space for .sig) */ - len = strlen(final_db_url) + 5; + /* if we downloaded a DB, we want the .sig from the same server - + this information is only available from the internal downloader */ + if(handle->fetchcb == NULL) { + /* print final_db_url into a buffer (leave space for .sig) */ + len = strlen(final_db_url) + 5; + } else { + /* print server + filename into a buffer (leave space for .sig) */ + len = strlen(server) + strlen(db->treename) + 9; + } + /* TODO fix leak syncpath and umask unset */ MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(payload.fileurl, len, "%s.sig", final_db_url); + + if(handle->fetchcb == NULL) { + snprintf(payload.fileurl, len, "%s.sig", final_db_url); + } else { + snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); + } + payload.handle = handle; payload.force = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); -- 2.1.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-490-g0d24994
by allan＠archlinux.org 17 Nov '14

17 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0d249949345e69fc1728df236569d1153582244c (commit) via 694901259031c19178cbfaa7087a2950d2dde477 (commit) via db2562113ba014442568f9ba76a0c6a01674fcd4 (commit) via be3ce88bb21cc62a3788a7aca6322a312f6b87d7 (commit) via f66ae5334eb1b5b816346cc3e69d01cf5e7fe306 (commit) via f6b3c9d8038085a9b8ac2151a0ca3dafd637d3e2 (commit) via ecf0e37fc5b583c3694e6847e9f38edb8bae413a (commit) via 6029a77ac0f7667e1cc40fe0239b45e6217f0c25 (commit) via bd746568f6554789537baf96e5f75ff35737bd98 (commit) via 03aa44a3ecab8ede51d3a6a780017b59babe2965 (commit) via f77933ea1e45638d518206c839315d3feece2c01 (commit) via 9594f513a46220b12f515201dd3b034a7c648992 (commit) via 37aeb436443f9e37991ab557b91eea035d68ffc4 (commit) via de442b6867b9f21c3a01a6c03339cf86812944a8 (commit) via 167a598265b9f81f5afc71380c4f6b871caeb76b (commit) from bd744d067da1ac455e8a9cdfb622c655f14e485d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d249949345e69fc1728df236569d1153582244c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 23 14:04:48 2014 -0400 makepkg: only strip vcs prefixes from front of url Referenced by FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 694901259031c19178cbfaa7087a2950d2dde477 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 23 14:04:47 2014 -0400 makepkg: do not strip bzr+ from bzr+ssh urls bzr does not recognize bare ssh:// urls. Fixes FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db2562113ba014442568f9ba76a0c6a01674fcd4 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 1 11:38:44 2014 +0200 makepkg: bzr: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. This also changes the checkout during bzr source "extraction" to a heavyweight checkout so that pulling a specific revision does not alter the original download. Original-work-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit be3ce88bb21cc62a3788a7aca6322a312f6b87d7 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:22 2013 +0100 makepkg: hg: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f66ae5334eb1b5b816346cc3e69d01cf5e7fe306 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:20 2013 +0100 makepkg: checkout a revision specified in SVN fragment in download_svn. 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f6b3c9d8038085a9b8ac2151a0ca3dafd637d3e2 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 21:31:23 2013 +0100 makepkg: git: update existing sources in srcdir without removing them first. The local changes are discarded when updating. This matches the behaviour when non-VCS sources are used. It also allows incremental builds. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ecf0e37fc5b583c3694e6847e9f38edb8bae413a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 9 15:53:16 2014 +1000 makepkg: improve stripping pkgdesc of whitespace for .PKGINFO Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6029a77ac0f7667e1cc40fe0239b45e6217f0c25 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 8 23:06:43 2014 -0500 makepkg: introduce .SRCINFO files for source packages Similar to .PKGINFO, .SRCINFO provides structured metadata from the PKGBUILD to be included with source packages. The format is structured such that it contains a "pkgbase" and one to many "pkgname" sections. Each "pkgname" section represents an "output package", and inherits all of the attributes of the "pkgbase" section, and then can define their own additive fields. For example, a simple PKGBUILD: pkgbase=ponies pkgname=('applejack' 'pinkiepie') pkgver=1.2.3 pkgrel=1 arch=('x86_64' 'i686') depends=('friendship' 'magic') build() { ...; } package_applejack() { provides=('courage') ...; } package_pinkiepie() { provides=('laughter') ...; } Would yield the following .SRCINFO file: pkgbase = ponies pkgdesc = friendship is magic pkgver = 1.2.3 pkgrel = 1 arch = x86_64 arch = i686 depends = friendship depends = magic pkgname = applejack provides = courage pkgname = pinkiepie provides = laughter The code to generate this new file is taken a project which I've been incubating[0] under the guise of 'mkaurball', which creates .AURINFO files for the AUR. AURINFO is the exactly same file as .SRCINFO, but named as such to make it clear that this is specific to the AUR. Because we're parsing shell in the packaging functions rather than executing it, there *are* some limitations, but these only really crop up in more "exotic" PKGBUILDs. Smoketesting[1] for accuracy in the Arch repos yields 100% accuracy for [core] and [extra]. [community] clocks in at ~98% accuracy (.3% difference per PKGBUILD), largely due to silly haskell packages calling pacman from inside the PKGBUILD to determine dependencies. [multilib] currently shows about 92% accuracy -- a statistic which can be largely improved by utilizing the recently merged arch-specific attribute work. This is also a smaller repo so the numbers are somewhat inflated. In reality, this is only a .8% variance per PKGBUILD. Together, we can make PKGBUILD better. [0] https://github.com/falconindy/pkgbuild-introspection [1] https://github.com/falconindy/pkgbuild-introspection/blob/master/test/smoke… Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd746568f6554789537baf96e5f75ff35737bd98 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 8 23:30:30 2014 -0500 makepkg: simplify epoch handling We can avoid setting a default value for epoch since we intend to mean unset and "0" as the same thing. This is also a more consistent default as the display of epoch=0 is no epoch at all in the full package version. The extra paranoia in get_full_version can be removed due to lint_epoch guarding against non-integer values of epoch. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03aa44a3ecab8ede51d3a6a780017b59babe2965 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 20 17:33:02 2014 -0400 makepkg: ignore empty global attributes in extraction This bug isn't currently exposed by any of the existing codepaths, but an upcoming patch to introduce SRCINFO files to makepkg will expose this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f77933ea1e45638d518206c839315d3feece2c01 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Nov 5 09:24:35 2014 +0100 Add --assume-installed to shell completion Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9594f513a46220b12f515201dd3b034a7c648992 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Nov 4 20:40:51 2014 +0100 Add --assume-installed to pacman --help Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37aeb436443f9e37991ab557b91eea035d68ffc4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:23 2014 -0500 makepkg.8: remove superfluous "::" in envvar description Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de442b6867b9f21c3a01a6c03339cf86812944a8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:22 2014 -0500 bash_completion: add --noarchive to makepkg's completions Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 167a598265b9f81f5afc71380c4f6b871caeb76b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 4 08:10:21 2014 -0500 updpkgsums: avoid exec'ing awk, so the trap actually works Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 8 +- contrib/updpkgsums.sh.in | 2 +- contrib/zsh_completion.in | 3 + doc/makepkg.8.txt | 2 +- scripts/makepkg.sh.in | 214 ++++++++++++++++++++++++++++++++++----------- src/pacman/pacman.c | 2 + 6 files changed, 173 insertions(+), 58 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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] [PATCH] paccache: adding removeuninstall option
by Maxim Andersson 09 Nov '14

09 Nov '14

This option removes every uninstalled package in the cache. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 62 +++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 71aee23..02ccc22 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -23,7 +23,7 @@ shopt -s extglob declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' -declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() +declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() installedpkgs=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 declare delim=$'\n' keep=3 movedir= scanarch= @@ -94,11 +94,18 @@ pkgfilter() { # create blacklist blen = ARGV[i]; delete ARGV[i] - while (i++ < ARGC) { + while (i++ < 2 + wlen + blen) { blacklist[ARGV[i]] = 1 delete ARGV[i] } + # create installedpkgs + ilen = ARGV[i]; delete ARGV[i] + while (i++ < ARGC) { + installedpkgs[ARGV[i]] = 1 + delete ARGV[i] + } + # read package filenames while (getline < "/dev/stdin") { parse_filename($0) @@ -108,9 +115,14 @@ pkgfilter() { # idx[1,2] = idx[pkgname,arch] split(pkglist, idx, SUBSEP) + count = split(packages[idx[1], idx[2]], pkgs, SUBSEP) + + if (ilen && !installedpkgs[idx[1]]) { + for (i in pkgs) { + print pkgs[i] + } # enforce architecture match if specified - if (!scanarch || scanarch == idx[2]) { - count = split(packages[idx[1], idx[2]], pkgs, SUBSEP) + } else if (!scanarch || scanarch == idx[2]) { for(i = 1; i <= count - keep; i++) { print pkgs[i] } @@ -177,25 +189,26 @@ A flexible pacman cache cleaning utility. Usage: ${myname} <operation> [options] [targets...] Operations: - -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to "dir". - -r, --remove remove candidate packages. + -d, --dryrun perform a dry run, only finding candidate packages. + -m, --move <dir> move candidate packages to "dir". + -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. can be used more than once. - (default: read from @sysconfdir@/pacman.conf). - -f, --force apply force to mv(1) and rm(1) operations. - -h, --help display this help message and exit. - -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify - "-" to read package names from stdin, newline- - delimited. - -k, --keep <num> keep "num" of each package in the cache (default: 3). - --nocolor remove color from output. - -u, --uninstalled target uninstalled packages. - -v, --verbose increase verbosity. specify up to 3 times. - -z, --null use null delimiters for candidate names (only with -v - and -vv). + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dir> scan "dir" for packages. can be used more than once. + (default: read from @sysconfdir@/pacman.conf). + -f, --force apply force to mv(1) and rm(1) operations. + -h, --help display this help message and exit. + -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, + specify "-" to read package names from stdin, + newline-delimited. + -k, --keep <num> keep "num" of each package in the cache (default: 3) + --nocolor remove color from output. + --removeuninstalled removes every uninstalled package in the cache. + -u, --uninstalled target uninstalled packages. + -v, --verbose increase verbosity. specify up to 3 times. + -z, --null use null delimiters for candidate names (only with + -v and -vv). EOF } @@ -207,7 +220,7 @@ version() { OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' - 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') + 'nocolor' 'remove' 'removeuninstalled' 'uninstalled' 'version' 'verbose' 'null') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -254,6 +267,8 @@ while :; do shift ;; -r|--remove) delete=1 ;; + --removeuninstalled) + IFS=$'\n' read -r -d '' -a installedpkgs < <(pacman -Qq) ;; -u|--uninstalled) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) blacklist+=("${ign[@]}") @@ -318,7 +333,8 @@ for cachedir in "${cachedirs[@]}"; do <(printf '%s\n' "$PWD"/*.pkg.tar?(.+([^.])) | pacsort --files | pkgfilter "$keep" "$scanarch" \ "${#whitelist[*]}" "${whitelist[@]}" \ - "${#blacklist[*]}" "${blacklist[@]}") + "${#blacklist[*]}" "${blacklist[@]}" \ + "${#installedpkgs[*]}" "${installedpkgs[@]}") candidates+=("${cand[@]}") unset cand -- 2.1.2

2 1

[pacman-dev] [PATCH] makepkg: improve stripping pkgdesc of whitespace for .PKGINFO
by Allan McRae 09 Nov '14

09 Nov '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 15eaa01..ec28bf3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2153,7 +2153,12 @@ write_pkginfo() { printf "basever = %s\n" "$basever" fi - printf "pkgdesc = %s\n" "${pkgdesc//+([[:space:]])/ }" + # TODO: all fields should have this treatment + local spd="${pkgdesc//+([[:space:]])/ }" + spd=("${spd[@]#[[:space:]]}") + spd=("${spd[@]%[[:space:]]}") + + printf "pkgdesc = %s\n" "$spd" printf "url = %s\n" "$url" printf "builddate = %s\n" "$builddate" printf "packager = %s\n" "$packager" -- 2.1.3

1 0

[pacman-dev] [PATCH] makepkg: simplify epoch handling
by Dave Reisner 09 Nov '14

09 Nov '14

We can avoid setting a default value for epoch since we intend to mean unset and "0" as the same thing. This is also a more consistent default as the display of epoch=0 is no epoch at all in the full package version. The extra paranoia in get_full_version can be removed due to lint_epoch guarding against non-integer values of epoch. --- scripts/makepkg.sh.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9614069..d3b7acb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -866,7 +866,6 @@ update_pkgver() { fi @SEDINPLACE@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE" source_safe "$BUILDFILE" - epoch=${epoch:-0} local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else @@ -888,7 +887,7 @@ missing_source_file() { # return : full version spec, including epoch (if necessary), pkgver, pkgrel ## get_full_version() { - if [[ $epoch ]] && (( epoch > 0 )); then + if (( epoch > 0 )); then printf "%s\n" "$epoch:$pkgver-$pkgrel" else printf "%s\n" "$pkgver-$pkgrel" @@ -3461,7 +3460,6 @@ fi # set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} -epoch=${epoch:-0} basever=$(get_full_version) if [[ $BUILDDIR = "$startdir" ]]; then -- 2.1.3

1 0

[pacman-dev] [RFC] makepkg: introduce .SRCINFO files for source packages
by Dave Reisner 09 Nov '14

09 Nov '14

Similar to .PKGINFO, .SRCINFO provides structured metadata from the PKGBUILD to be included with source packages. The format is structured such that it contains a "pkgbase" and one to many "pkgname" sections. Each "pkgname" section represents an "output package", and inherits all of the attributes of the "pkgbase" section, and then can define their own additive fields. For example, a simple PKGBUILD: pkgbase=ponies pkgname=('applejack' 'pinkiepie') pkgver=1.2.3 pkgrel=1 arch=('x86_64' 'i686') depends=('friendship' 'magic') build() { ...; } package_applejack() { provides=('courage') ...; } package_pinkiepie() { provides=('laughter') ...; } Would yield the following .SRCINFO file: pkgbase = ponies pkgdesc = friendship is magic pkgver = 1.2.3 pkgrel = 1 arch = x86_64 arch = i686 depends = friendship depends = magic pkgname = applejack provides = courage pkgname = pinkiepie provides = laughter The code to generate this new file is taken a project which I've been incubating[0] under the guise of 'mkaurball', which creates .AURINFO files for the AUR. AURINFO is the exactly same file as .SRCINFO, but named as such to make it clear that this is specific to the AUR. Because we're parsing shell in the packaging functions rather than executing it, there *are* some limitations, but these only really crop up in more "exotic" PKGBUILDs. Smoketesting[1] for accuracy in the Arch repos yields 100% accuracy for [core] and [extra]. [community] clocks in at ~98% accuracy (.3% difference per PKGBUILD), largely due to silly haskell packages calling pacman from inside the PKGBUILD to determine dependencies. [multilib] currently shows about 92% accuracy -- a statistic which can be largely improved by utilizing the recently merged arch-specific attribute work. This is also a smaller repo so the numbers are somewhat inflated. In reality, this is only a .8% variance per PKGBUILD. Together, we can make PKGBUILD better. [0] https://github.com/falconindy/pkgbuild-introspection [1] https://github.com/falconindy/pkgbuild-introspection/blob/master/test/smoke… --- Based on Allan's recent email about the feature freeze being pushed back, I'm offering this up for discussion. scripts/makepkg.sh.in | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a67d94..0349e05 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2031,6 +2031,99 @@ find_libprovides() { printf '%s\n' "${libprovides[@]}" } +srcinfo_open_section() { + printf '%s = %s\n' "$1" "$2" +} + +srcinfo_close_section() { + echo +} + +srcinfo_write_attr() { + # $1: attr name + # $2: attr values + + local attrname=$1 attrvalues=("${@:2}") + + # normalize whitespace, strip leading and trailing + attrvalues=("${attrvalues[@]//+([[:space:]])/ }") + attrvalues=("${attrvalues[@]#[[:space:]]}") + attrvalues=("${attrvalues[@]%[[:space:]]}") + + printf "\t$attrname = %s\n" "${attrvalues[@]}" +} + +pkgbuild_extract_to_srcinfo() { + # $1: pkgname + # $2: attr name + # $3: multivalued + + local pkgname=$1 attrname=$2 isarray=$3 outvalue= + + if pkgbuild_get_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then + srcinfo_write_attr "$attrname" "${outvalue[@]}" + fi +} + +srcinfo_write_section_details() { + local attr package_arch a + local multivalued_arch_attrs=(source provides conflicts depends replaces + optdepends makedepends checkdepends) + + for attr in "${singlevalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 0 + done + + for attr in "${multivalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 1 + done + + pkgbuild_get_attribute "$1" 'arch' 1 'package_arch' + for a in "${package_arch[@]}"; do + # 'any' is special. there's no support for, e.g. depends_any. + [[ $a = any ]] && continue + + for attr in "${multivalued_arch_attrs[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 + done + done +} + +srcinfo_write_global() { + local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) + local multivalued=(arch groups license checkdepends makedepends + depends optdepends provides conflicts replaces + noextract options backup + source {md5,sha{1,224,256,384,512}}sums) + + srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" + srcinfo_write_section_details '' + srcinfo_close_section +} + +srcinfo_write_package() { + local singlevalued=(pkgdesc url install changelog) + local multivalued=(arch groups license checkdepends depends optdepends + provides conflicts replaces options backup) + + srcinfo_open_section 'pkgname' "$1" + srcinfo_write_section_details "$1" + srcinfo_close_section +} + +write_srcinfo() { + local pkg + + printf "# Generated by makepkg %s\n" "$makepkg_version" + printf "# %s\n" "$(LC_ALL=C date -u)" + + srcinfo_write_global + + for pkg in "${pkgname[@]}"; do + srcinfo_write_package "$pkg" + done +} + write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then @@ -2243,6 +2336,9 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" + msg2 "$(gettext "Generating %s file...")" .SRCINFO + write_srcinfo > "$srclinks/$pkgbase"/.SRCINFO + local file all_sources get_all_sources 'all_sources' -- 2.1.2

3 5

[pacman-dev] [PATCH 1/4] makepkg: ignore empty global attributes for SRCINFO
by Dave Reisner 05 Nov '14

05 Nov '14

--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi } -- 2.1.3

3 7

[pacman-dev] [PATCH 1/2] Add --assume-installed to pacman --help
by Florian Pritz 05 Nov '14

05 Nov '14

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3d1406b..6161048 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -185,6 +185,8 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); + addlist(_(" --assume-installed <package=version>\n" + " add a virtual package to satisfy dependencies\n")); addlist(_(" --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); -- 2.1.3

2 3