- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: fix log file names for arch=any packages
by Florian Pritz 20 Jun '12

20 Jun '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg.sh.in | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..9a41417 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -151,18 +151,23 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [[ -n $pkgbase ]]; then local fullver=$(get_full_version) + local logarch=$CARCH + if [[ $arch = "any" ]]; then + logarch="any" + fi + # Can't do this unless the BUILDSCRIPT has been sourced. if (( BUILDFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-build.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-build.log"* fi if (( CHECKFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-check.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-check.log"* fi if (( PKGFUNC )); then - rm -f "${pkgbase}-${fullver}-${CARCH}-package.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-package.log"* elif (( SPLITPKG )); then for pkg in ${pkgname[@]}; do - rm -f "${pkgbase}-${fullver}-${CARCH}-package_${pkg}.log"* + rm -f "${pkgbase}-${fullver}-${logarch}-package_${pkg}.log"* done fi @@ -974,7 +979,13 @@ run_function() { local ret=0 if (( LOGGING )); then local fullver=$(get_full_version) - local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" + + local logarch=$CARCH + if [[ $arch = "any" ]]; then + logarch="any" + fi + + local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${logarch}-$pkgfunc.log" if [[ -f $BUILDLOG ]]; then local i=1 while true; do -- 1.7.10.4

3 4

[pacman-dev] [PATCH] Create split package dirs first
by Emil Renner Berthing 20 Jun '12

20 Jun '12

Hi, When creating split packages I always wished one could just do make install in one of the package functions and then directly move the files belonging to other packages off to their respective pkgdirs. If you look at the PKGBUILD for systemd this is basically what it's doing except for one thing: the pkgdirs aren't created before calling the package functions. To work around this it creates it's own temporary _$pkgdir directories, moves the files to there and then from there to their proper destination in the later package functions. The following small patch fixes this. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..2a2901c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1924,9 +1924,11 @@ restore_package_variables() { run_split_packaging() { local pkgname_backup=${pkgname[@]} for pkgname in ${pkgname_backup[@]}; do + mkdir -p "$pkgdir/$pkgname" + chmod a-s "$pkgdir/$pkgname" + done + for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdir/$pkgname" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" backup_package_variables run_package $pkgname tidy_install

2 2

[pacman-dev] [PATCH 1/2] pacman-key: Use lsign_keys function in --populate
by Pierre Schmitz 20 Jun '12

20 Jun '12

This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- scripts/pacman-key.sh.in | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ae491d2..e5b6021 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -302,7 +302,7 @@ populate_keyring() { msg "$(gettext "Locally signing trusted keys in keyring...")" for key_id in "${!trusted_ids[@]}"; do msg2 "$(gettext "Locally signing key %s...")" "${key_id}" - "${GPG_PACMAN[@]}" --quiet --lsign-key "${key_id}" + lsign_keys "${key_id}" done msg "$(gettext "Importing owner trust values...")" for keyring in "${KEYRINGIDS[@]}"; do @@ -440,6 +440,7 @@ list_sigs() { lsign_keys() { check_keyids_exist + # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "$@" 2>/dev/null if (( PIPESTATUS[1] )); then error "$(gettext "A specified key could not be locally signed.")" -- 1.7.10.4

2 6

[pacman-dev] [PATCH] pacman-key: hanlde local signing of multiple keys
by Allan McRae 20 Jun '12

20 Jun '12

gpg --lsign-key does not like being given multiple keys to sign. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e5b6021..d2389b0 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -301,7 +301,6 @@ populate_keyring() { if (( ${#trusted_ids[@]} > 0 )); then msg "$(gettext "Locally signing trusted keys in keyring...")" for key_id in "${!trusted_ids[@]}"; do - msg2 "$(gettext "Locally signing key %s...")" "${key_id}" lsign_keys "${key_id}" done msg "$(gettext "Importing owner trust values...")" @@ -440,10 +439,19 @@ list_sigs() { lsign_keys() { check_keyids_exist - # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid - printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "$@" 2>/dev/null - if (( PIPESTATUS[1] )); then - error "$(gettext "A specified key could not be locally signed.")" + + local ret=0 + for key_id in "$@"; do + msg2 "$(gettext "Locally signing key %s...")" "${key_id}" + # we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid + printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${key_id}" 2>/dev/null + if (( PIPESTATUS[1] )); then + error "$(gettext "%s could not be locally signed.")" "${key_id}" + ret=1 + fi + done + + if (( ret )); then exit 1 fi } -- 1.7.11

2 2

[pacman-dev] [PATCH] remove comments blocking zsh completion for names
by Daniel Wallace 20 Jun '12

20 Jun '12

Apparently I missed when This was actually added, but I had it in with the first patch, just remove the comments for completion of names with pacman-key --list-keys etc. Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- contrib/zsh_completion.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index e81257b..84ee93c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -420,12 +420,11 @@ _keys() { if (match($NF, /<[^>]+>/)) print substr($NF, RSTART + 1, RLENGTH - 2) #this adds support for names as well if that is ever added - # } - #$1 == "uid" { - #for (i=2;i<NF;i++) {printf "%s%s",sep, $i;sep=" "}; printf "\n" - }' #|sed -e 's/(.*)//g' -e 's/^\ //g' -e 's/\ *$//g' |uniq + } + $1 == "uid" { + for (i=2;i<NF;i++) {printf "%s%s",sep, $i;sep=" "}; printf "\n" + }' |sed -e 's/(.*)//g' -e 's/^\ //g' -e 's/\ *$//g' |uniq ) - #keys=(${keylist//$'\n'/\/}) keys=(${(s:/:)${keylist//$'\n'/\/}}) _describe -t modules 'keys in keyring' keys && return 0 } -- 1.7.11

2 1

[pacman-dev] [PATCH] Allow cleaning only some cachedirs
by Jan Alexander Steffens (heftig) 19 Jun '12

19 Jun '12

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> When cleaning the cache, ask for each cachedir separately. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> --- src/pacman/sync.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3b09485..5210bbf 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -172,10 +172,6 @@ static int sync_cleancache(int level) alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); int ret = 0; - for(i = cachedirs; i; i = alpm_list_next(i)) { - printf(_("Cache directory: %s\n"), (const char *)i->data); - } - if(!config->cleanmethod) { /* default to KeepInstalled if user did not specify */ config->cleanmethod = PM_CLEAN_KEEPINST; @@ -189,22 +185,28 @@ static int sync_cleancache(int level) if(config->cleanmethod & PM_CLEAN_KEEPCUR) { printf(_(" All current sync database packages\n")); } - if(!yesno(_("Do you want to remove all other packages from cache?"))) { - return 0; - } - printf(_("removing old packages from cache...\n")); - } else { - if(!noyes(_("Do you want to remove ALL files from cache?"))) { - return 0; - } - printf(_("removing all files from cache...\n")); } for(i = cachedirs; i; i = alpm_list_next(i)) { const char *cachedir = i->data; - DIR *dir = opendir(cachedir); + DIR *dir; struct dirent *ent; + printf(_("Cache directory: %s\n"), (const char *)i->data); + + if(level == 1) { + if(!yesno(_("Do you want to remove all other packages from cache?"))) { + continue; + } + printf(_("removing old packages from cache...\n")); + } else { + if(!noyes(_("Do you want to remove ALL files from cache?"))) { + continue; + } + printf(_("removing all files from cache...\n")); + } + + dir = opendir(cachedir); if(dir == NULL) { pm_printf(ALPM_LOG_ERROR, _("could not access cache directory %s\n"), cachedir); -- 1.7.10.4

2 1

[pacman-dev] [PATCH] Added syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays Fixed FS#29213
by jstjohn＠purdue.edu 19 Jun '12

19 Jun '12

From: "Jason St. John" <jstjohn(a)purdue.edu> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- contrib/PKGBUILD.vim | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 4d69e4d..72334e4 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -69,8 +69,8 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained " echo $(pacman -Ql licenses | grep '/usr/share/licenses/common/' | cut -d'/' -f6 | sort -u) -syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RALINK RUBY ZPL contained -" special cases from http://wiki.archlinux.org/index.php/Arch_Packaging_Standards +syn keyword pbLicense AGPL AGPL3 Apache APACHE Artistic2.0 CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RUBY W3C ZPL contained +" special cases from https://wiki.archlinux.org/index.php/Arch_Packaging_Standards syn keyword pbLicenseSpecial BSD MIT ZLIB Python contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense @@ -176,6 +176,39 @@ hi def link pbSha1Quotes Keyword hi def link pbSha1Hash Error hi def link pbValidSha1sums Number +" sha256sums +syn keyword pb_k_sha256sums sha256sums contained +syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums +syn match pbValidSha256sums /\x\{64\}/ contained +syn region pbSha256sumsGroup start=/^sha256sums/ end=/)/ contains=pb_k_sha256sums,pbSha256Quotes,pbSha256Hash,pbIllegalSha256sums keepend +syn match pbSha256Quotes /'.*'\|".*"/ contained contains=pbSha256Hash,pbIllegalSha256sums +syn match pbSha256Hash /\x\+/ contained contains=pbValidSha256sums +hi def link pbSha256Quotes Keyword +hi def link pbSha256Hash Error +hi def link pbValidSha256sums Number + +" sha384sums +syn keyword pb_k_sha384sums sha384sums contained +syn match pbIllegalSha384sums /[^='"()\/ ]/ contained contains=pbValidSha384sums +syn match pbValidSha384sums /\x\{96\}/ contained +syn region pbSha384sumsGroup start=/^sha384sums/ end=/)/ contains=pb_k_sha384sums,pbSha384Quotes,pbSha384Hash,pbIllegalSha384sums keepend +syn match pbSha384Quotes /'.*'\|".*"/ contained contains=pbSha384Hash,pbIllegalSha384sums +syn match pbSha384Hash /\x\+/ contained contains=pbValidSha384sums +hi def link pbSha384Quotes Keyword +hi def link pbSha384Hash Error +hi def link pbValidSha384sums Number + +" sha512sums +syn keyword pb_k_sha512sums sha512sums contained +syn match pbIllegalSha512sums /[^='"()\/ ]/ contained contains=pbValidSha512sums +syn match pbValidSha512sums /\x\{128\}/ contained +syn region pbSha512sumsGroup start=/^sha512sums/ end=/)/ contains=pb_k_sha512sums,pbSha512Quotes,pbSha512Hash,pbIllegalSha512sums keepend +syn match pbSha512Quotes /'.*'\|".*"/ contained contains=pbSha512Hash,pbIllegalSha512sums +syn match pbSha512Hash /\x\+/ contained contains=pbValidSha512sums +hi def link pbSha512Quotes Keyword +hi def link pbSha512Hash Error +hi def link pbValidSha512sums Number + " options syn keyword pb_k_options options contained syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained @@ -258,6 +291,15 @@ hi def link pbIllegalMd5sums Error hi def link pb_k_sha1sums pbKeywords hi def link pbIllegalSha1sums Error +hi def link pb_k_sha256sums pbKeywords +hi def link pbIllegalSha256sums Error + +hi def link pb_k_sha384sums pbKeywords +hi def link pbIllegalSha384sums Error + +hi def link pb_k_sha512sums pbKeywords +hi def link pbIllegalSha512sums Error + hi def link pb_k_options pbKeywords hi def link pbOptionsDeprec Todo hi def link pbIllegalOption Error -- 1.7.10.4

2 1

[pacman-dev] [PATCH] Fixed FS#29213 and added Vim syntax highlighting for sha256sums, sha384sums, and sha512sums arrays
by Jason St. John 18 Jun '12

18 Jun '12

Hello, This is a patch submission for the latest pacman code in the Git repository. My patch fixes FS#29213 and adds proper Vim syntax highlighting for the sha256sums, sha384sums, and sha512sums arrays in PKGBUILDs. I asked falconindy in #archlinux-pacman about how to submit my patch, and because I use web mail exclusively (so I can't use `git send-email`), we decided it would be best for me to publish the change on GitHub and link it here. He warned me that pasting the diff in the body of the message would result in it becoming mangled on the mailing list. https://github.com/jrstjohn/pacman/commit/bf674fb168288e2e9f30cb85cc0dc69a9… Thanks! Jason

1 0

[pacman-dev] [PATCH 0/5] Random fixes from my working branch
by Dave Reisner 14 Jun '12

14 Jun '12

Posting this random collection of patches before they grow hair and develop a personality more likeable than mine. Dave Reisner (5): add real_line_size to alpm_read_buffer add line length parameter to _alpm_strip_newline contrib: sed out @SCRIPTNAME@ in edit command updpkgsums: avoid fancy quoting in error message diskspace: log errors when opening the mount table fails contrib/Makefile.am | 1 + contrib/updpkgsums.sh.in | 2 +- lib/libalpm/be_local.c | 14 +++++++------- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 8 ++++---- lib/libalpm/diskspace.c | 6 ++++++ lib/libalpm/util.c | 12 +++++++----- lib/libalpm/util.h | 3 ++- 8 files changed, 29 insertions(+), 19 deletions(-) -- 1.7.10.4

2 6

[pacman-dev] [PATCH 2/2] Allow wildcards in PURGE_TARGETS to match any type of file except for directories.
by jhuntwork＠lightcubesolutions.com 12 Jun '12

12 Jun '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0918ae..eb239e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1048,7 +1048,7 @@ tidy_install() { local pt for pt in "${PURGE_TARGETS[@]}"; do if [[ ${pt} = "${pt//\/}" ]]; then - find . -type f -name "${pt}" -exec rm -f -- '{}' \; + find . ! -type d -name "${pt}" -exec rm -f -- '{}' \; else rm -f ${pt} fi -- 1.7.1

3 10