- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Use MALLOC throughtout libalpm
by Allan McRae 08 Mar '14

08 Mar '14

Use MALLOC instead of malloc for safety in libalpm. Some changes are pure refactoring, but for others this provides a success check for memory allocation. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 6 +----- lib/libalpm/be_package.c | 8 +++----- lib/libalpm/pkghash.c | 5 +---- lib/libalpm/sync.c | 3 ++- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5474995..9a9bdef 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -743,11 +743,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) /* since we know the length of the file string already, * we can do malloc + memcpy rather than strdup */ len += 1; - files[files_count].name = malloc(len); - if(files[files_count].name == NULL) { - _alpm_alloc_fail(len); - goto error; - } + MALLOC(files[files_count].name, len, goto error); memcpy(files[files_count].name, line, len); files_count++; } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3c35484..dc2e072 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -39,6 +39,7 @@ #include "package.h" #include "deps.h" #include "filelist.h" +#include "util.h" struct package_changelog { struct archive *archive; @@ -404,11 +405,8 @@ static int add_entry_to_files_list(alpm_pkg_t *pkg, size_t *files_size, * Other code relies on it to detect directories so add it here.*/ if(type == AE_IFDIR && path[pathlen - 1] != '/') { /* 2 = 1 for / + 1 for \0 */ - char *newpath = malloc(pathlen + 2); - if (!newpath) { - _alpm_alloc_fail(pathlen + 2); - return -1; - } + char *newpath; + MALLOC(newpath, pathlen + 2, return -1); strcpy(newpath, path); newpath[pathlen] = '/'; newpath[pathlen + 1] = '\0'; diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 2f68278..a740233 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -172,10 +172,7 @@ static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, position = get_hash_position(pkg->name_hash, hash); - ptr = malloc(sizeof(alpm_list_t)); - if(ptr == NULL) { - return hash; - } + MALLOC(ptr, sizeof(alpm_list_t), return hash); ptr->data = pkg; ptr->prev = ptr; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7e40d98..a025b68 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1135,8 +1135,9 @@ static int check_validity(alpm_handle_t *handle, if(_alpm_pkg_validate_internal(handle, v.path, v.pkg, v.level, &v.siglist, &v.validation) == -1) { + struct validity *invalid; v.error = handle->pm_errno; - struct validity *invalid = malloc(sizeof(struct validity)); + MALLOC(invalid, sizeof(struct validity), return -1); memcpy(invalid, &v, sizeof(struct validity)); errors = alpm_list_add(errors, invalid); } else { -- 1.9.0

1 0

[pacman-dev] Another 4.1.x release?
by Jerome Barnett 06 Mar '14

06 Mar '14

Allan, Here's a nice candidate for inclusion in a 4.1.x release: https://projects.archlinux.org/pacman.git/commit/?id=dfcea1456da5df042f2ba2… which was in response to: Arch FS#31479 Full disclosure: It was my feature request and I'm biased, but it is a nice self-contained patch. Anyways, thank you for your consideration. -Jerome (TechRyda)

3 2

[pacman-dev] [PATCHv3 1/2] contrib: adding pacsize
by Pierre Neidhardt 06 Mar '14

06 Mar '14

Printing package size is useful for maintenance. Indeed, the first entry on the wiki is focused on this topic: https://wiki.archlinux.org/index.php/Pacman_Tips#Maintenance None of the proposed solutions will allow you to: - select packages; - work on the output of other commands yielding a list of packages; - change the sorting; - be locale independent; - print a grand total; - be fast (most solution are wasting a lot of time -- only expac is faster); - not rely on third-party tools. Pacsize is a POSIX shell script that is generic enough to enclose all these features (and more). It superseeds the (broken) pacsysclean. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/.gitignore | 1 + contrib/Makefile.am | 3 + contrib/README | 4 ++ contrib/pacsize.sh.in | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+) create mode 100644 contrib/pacsize.sh.in diff --git a/contrib/.gitignore b/contrib/.gitignore index a181813..9cecd5e 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,6 +7,7 @@ paclist paclog-pkglist pacscripts pacsearch +pacsize pacsysclean rankmirrors updpkgsums diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f6ca3f1..8c5c6da 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,6 +12,7 @@ BASHSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ + pacsize \ pacsysclean \ rankmirrors \ updpkgsums @@ -38,6 +39,7 @@ EXTRA_DIST = \ paclist.sh.in \ pacscripts.sh.in \ pacsearch.in \ + pacsize.sh.in \ pacsysclean.sh.in \ rankmirrors.sh.in \ updpkgsums.sh.in \ @@ -102,6 +104,7 @@ paclist: $(srcdir)/paclist.sh.in paclog-pkglist: $(srcdir)/paclog-pkglist.sh.in pacscripts: $(srcdir)/pacscripts.sh.in pacsearch: $(srcdir)/pacsearch.in +pacsize: $(srcdir)/pacsize.sh.in pacsysclean: $(srcdir)/pacsysclean.sh.in rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in diff --git a/contrib/README b/contrib/README index ae33bb2..4f5c17f 100644 --- a/contrib/README +++ b/contrib/README @@ -31,6 +31,10 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. +pacsize - display the size of packages. Duplicates are removed if any. The local +database is queried first; if the package is not found, the sync database is +then used for lookup. + pacsysclean - lists installed packages sorted by size. rankmirrors - ranks pacman mirrors by their connection and opening speed. diff --git a/contrib/pacsize.sh.in b/contrib/pacsize.sh.in new file mode 100644 index 0000000..c84dd72 --- /dev/null +++ b/contrib/pacsize.sh.in @@ -0,0 +1,161 @@ +#!/bin/sh +# pacsize -- display package sizes +# +# Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +readonly myname='pacsize' +readonly myver='@PACKAGE_VERSION@' + +calc_total () { + awk '{ + total += $1 + print +} +END { + printf ("%7s KIB TOTAL\n", total) +}' +} + +error () { + echo "$@" >&2 +} + +## Print size and name. We round to the lowest integer, this makes output +## lighter. +filter () { + awk -F ": " \ + '$0 ~ "^Name" { + pkg = $2 +} +$0 ~ "^Installed Size" { + split($2, a, " ") + printf ("%4d%s %s\n", a[1], a[2], pkg) +}' +} + +remove_duplicates () { + awk '! table[$0]++' +} + +usage () { + cat <<EOF +Usage: ${1##*/} [OPTIONS] PACKAGES + ${1##*/} -a [OPTIONS] + +Display the size of PACKAGES. Duplicates are removed if any. The local database +is queried first; if the package is not found, the sync database is then used +for lookup. + +Options: + + -a: Process all installed packages. + -h: Show this help. + -n: Sort output by name. + -s: Sort output by size. + -t: Print total. + -V: Show version information. + +Examples: + + $ ${1##*/} -ast + Convenient way to keep track of big packages. + + $ ${1##*/} \$(pactree -ld1 linux) + Print the size of linux and all its direct dependencies. + + $ ${1##*/} -st \$(pacman -Qdtq) + Print a grand total of orphan packages, and sort by size. +EOF +} + +version () { + echo "$myname $myver" + echo 'Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com>' +} + +opt_sort=false +opt_all=false +opt_total=false + +while getopts ":ahnstV" opt; do + case $opt in + a) + opt_all=true ;; + h) + usage "$0" + exit ;; + n) + opt_sort="sort -uk3" ;; + s) + opt_sort="sort -uh" ;; + t) + opt_total="calc_total" ;; + V) + version "$0" + exit ;; + ?) + usage "$0" + exit 1 ;; + esac +done + +shift $(($OPTIND - 1)) + +## All-packages mode. +## We use a dedicated algorithm which is much faster than per-package mode. +## Unfortunately there is no easy way to select packages with this method. +if $opt_all; then + DBPath="$(awk -F "=[ \t]*" '/^[ \t]*DBPath[ \t]*=/{gsub(/[ \t]*$/, "", $2); print $2}' @sysconfdir@/pacman.conf 2>/dev/null)" + [ -z "$DBPath" ] && DBPath="@localstatedir@/lib/pacman" + + if [ ! -d "$DBPath/local/" ]; then + error "Could not find local database in $DBPath/local/." + exit 1 + fi + + awk 'BEGIN { + split("B KiB MiB GiB TiB PiB EiB ZiB YiB", unit) +} +$0 == "%NAME%" { + getline pkg +} +$0 == "%SIZE%" { + getline size + i = 1 + while (size > 2048) { + size /= 1024 + i++ + } + printf ("%4d%s %s\n", size, unit[i], pkg) +}' "$DBPath"/local/*/desc | { $opt_sort || cat ;} | { $opt_total || cat ;} + exit +fi + +## Per-package mode. +if [ $# -eq 0 ]; then + error "Missing argument." + usage "$0" + exit 1 +fi + +{ + ## If package is not found locally (-Q), we use the sync database (-S). We + ## use LC_ALL=C to make sure pacman output is not localized. + buffer=$(LC_ALL=C pacman -Qi "$@" 2>&1 1>&3 3>&- | cut -f2 -d "'") + [ -n "$buffer" ] && LC_ALL=C pacman -Si $buffer +} 3>&1 | filter | { $opt_sort || remove_duplicates ;} | { $opt_total || cat ;} + +# vim: set noet: -- 1.9.0

1 0

[pacman-dev] [PATCHv2 1/2] contrib: adding pacsize
by Pierre Neidhardt 06 Mar '14

06 Mar '14

Printing package size is useful for maintenance. Indeed, the first entry on the wiki is focused on this topic: https://wiki.archlinux.org/index.php/Pacman_Tips#Maintenance None of the proposed solutions will allow you to: - select packages; - work on the output of other commands yielding a list of packages; - change the sorting; - be locale independent; - print a grand total; - be fast (most solution are wasting a lot of time -- only expac is faster); - not rely on third-party tools. Pacsize is a POSIX shell script that is generic enough to enclose all these features (and more). Adding a 'pacsize' script eliminates the unneeded abundance of workarounds for this simple matter. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/.gitignore | 1 + contrib/Makefile.am | 3 + contrib/README | 4 ++ contrib/pacsize.sh.in | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 contrib/pacsize.sh.in diff --git a/contrib/.gitignore b/contrib/.gitignore index a181813..9cecd5e 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,6 +7,7 @@ paclist paclog-pkglist pacscripts pacsearch +pacsize pacsysclean rankmirrors updpkgsums diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f6ca3f1..8c5c6da 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,6 +12,7 @@ BASHSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ + pacsize \ pacsysclean \ rankmirrors \ updpkgsums @@ -38,6 +39,7 @@ EXTRA_DIST = \ paclist.sh.in \ pacscripts.sh.in \ pacsearch.in \ + pacsize.sh.in \ pacsysclean.sh.in \ rankmirrors.sh.in \ updpkgsums.sh.in \ @@ -102,6 +104,7 @@ paclist: $(srcdir)/paclist.sh.in paclog-pkglist: $(srcdir)/paclog-pkglist.sh.in pacscripts: $(srcdir)/pacscripts.sh.in pacsearch: $(srcdir)/pacsearch.in +pacsize: $(srcdir)/pacsize.sh.in pacsysclean: $(srcdir)/pacsysclean.sh.in rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in diff --git a/contrib/README b/contrib/README index ae33bb2..4f5c17f 100644 --- a/contrib/README +++ b/contrib/README @@ -31,6 +31,10 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. +pacsize - display the size of packages. Duplicates are removed if any. The local +database is queried first; if the package is not found, the sync database is +then used for lookup. + pacsysclean - lists installed packages sorted by size. rankmirrors - ranks pacman mirrors by their connection and opening speed. diff --git a/contrib/pacsize.sh.in b/contrib/pacsize.sh.in new file mode 100644 index 0000000..9be800d --- /dev/null +++ b/contrib/pacsize.sh.in @@ -0,0 +1,168 @@ +#!/bin/sh +# pacsize -- display package sizes +# +# Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +readonly myname='pacsize' +readonly myver='@PACKAGE_VERSION@' + +calc_total () { + awk '{ + total += $1 + print +} +END { + printf ("%7s KIB TOTAL\n", total) +}' +} + +error () { + echo "$@" >&2 +} + +## Print size and name. We strip the arguably useless decimals. This makes +## output lighter. +filter () { + awk -F ": " \ + '$0 ~ "^Name" { + pkg = $2 +} +$0 ~ "^Installed Size" { + gsub (/[\.,][^ ]*/, "") + split($2, a, " ") + printf ("%4d%s %s\n", a[1], a[2], pkg) +}' +} + +remove_duplicates () { + awk '! table[$0]++' +} + +usage () { + cat <<EOF +Usage: ${1##*/} [OPTIONS] PACKAGES + ${1##*/} -a [OPTIONS] + +Display the size of PACKAGES. Duplicates are removed if any. The local database +is queried first; if the package is not found, the sync database is then used +for lookup. + +Options: + + -a: Process all installed packages. + -h: Show this help. + -n: Sort output by name. + -s: Sort output by size. + -t: Print total. + +Examples: + + $ ${1##*/} -ast + Convenient way to keep track of big packages. + + $ ${1##*/} \$(pactree -ld1 linux) + Print the size of linux and all its direct dependencies. + + $ ${1##*/} -st \$(pacman -Qdtq) + Print a grand total of orphan packages, and sort by size. +EOF +} + +version () { + echo "$myname $myver" + echo 'Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com>' +} + +opt_sort=false +opt_all=false +opt_total=false + +while getopts ":ahnstv" opt; do + case $opt in + a) + opt_all=true ;; + h) + usage "$0" + exit ;; + n) + opt_sort="sort -uk3" ;; + s) + opt_sort="sort -uh" ;; + t) + opt_total="calc_total" ;; + v) + version "$0" + exit ;; + ?) + usage "$0" + exit 1 ;; + esac +done + +shift $(($OPTIND - 1)) + +## All-packages mode. +## We use a dedicated algorithm which is much faster than per-package mode. +## Unfortunately there is no easy way to select packages with this method. +if $opt_all; then + DBPath="$(awk -F = '/^ *DBPath/{print $2}' @sysconfdir@/pacman.conf 2>/dev/null)" + [ ! -d "$DBPath" ] && DBPath="@localstatedir@/lib/pacman" + + if [ ! -d "$DBPath/local/" ]; then + error "Could not find local database in $DBPath/local/." + exit 1 + fi + + awk 'BEGIN { + split("B KiB MiB GiB TiB PiB EiB ZiB YiB", unit) +} +/^%NAME%/ { + getline + pkg=$0 +} +/^%SIZE%/ { + getline + size = $0 + i = 1 + while (size > 2048) { + size /= 1024 + i++ + } + printf ("%4d%s %s\n", size, unit[i], pkg) +}' "$DBPath"/local/*/desc | ($opt_sort || cat) | ($opt_total || cat) + exit +fi + +## Per-package mode. +if [ $# -eq 0 ]; then + error "Missing argument." + usage "$0" + exit 1 +fi + +if ! command -v pacman >/dev/null 2>&1; then + error "'pacman' not found." + exit 1 +fi + +{ + ## If package is not found locally (-Q), we use the sync database (-S). We + ## use LC_ALL=C to make sure pacman output is not localized. + buffer=$(LC_ALL=C pacman -Qi "$@" 2>&1 1>&3 3>&- | cut -f2 -d "'") + [ -n "$buffer" ] && LC_ALL=C pacman -Si $buffer +} 3>&1 | filter | ($opt_sort || remove_duplicates) | ($opt_total || cat) + +# vim: set noet: -- 1.9.0

2 3

[pacman-dev] [PATCH 1/2] contrib: adding pacsize
by Pierre Neidhardt 06 Mar '14

06 Mar '14

Printing package size is useful for maintenance. Indeed, the first entry on the wiki is focused on this topic: https://wiki.archlinux.org/index.php/Pacman_Tips#Maintenance None of the proposed solutions will allow you to: - select packages; - work on the output of other commands yielding a list of packages; - change the sorting; - be locale independent; - print a grand total; - be fast (most solutions are wasting a lot of time -- only expac is faster); - not rely on any third-party tool. Pacsize is a POSIX shell script that is generic enough to enclose all these features (and more). Adding a 'pacsize' script eliminates the unneeded abundance of workarounds for this simple matter. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/.gitignore | 1 + contrib/Makefile.am | 3 + contrib/README | 4 ++ contrib/pacsize.sh.in | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+) create mode 100644 contrib/pacsize.sh.in diff --git a/contrib/.gitignore b/contrib/.gitignore index a181813..9cecd5e 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,6 +7,7 @@ paclist paclog-pkglist pacscripts pacsearch +pacsize pacsysclean rankmirrors updpkgsums diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f6ca3f1..8c5c6da 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,6 +12,7 @@ BASHSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ + pacsize \ pacsysclean \ rankmirrors \ updpkgsums @@ -38,6 +39,7 @@ EXTRA_DIST = \ paclist.sh.in \ pacscripts.sh.in \ pacsearch.in \ + pacsize.sh.in \ pacsysclean.sh.in \ rankmirrors.sh.in \ updpkgsums.sh.in \ @@ -102,6 +104,7 @@ paclist: $(srcdir)/paclist.sh.in paclog-pkglist: $(srcdir)/paclog-pkglist.sh.in pacscripts: $(srcdir)/pacscripts.sh.in pacsearch: $(srcdir)/pacsearch.in +pacsize: $(srcdir)/pacsize.sh.in pacsysclean: $(srcdir)/pacsysclean.sh.in rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in diff --git a/contrib/README b/contrib/README index ae33bb2..4f5c17f 100644 --- a/contrib/README +++ b/contrib/README @@ -31,6 +31,10 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. +pacsize - display the size of packages. Duplicates are removed if any. The local +database is queried first; if the package is not found, the sync database is +then used for lookup. + pacsysclean - lists installed packages sorted by size. rankmirrors - ranks pacman mirrors by their connection and opening speed. diff --git a/contrib/pacsize.sh.in b/contrib/pacsize.sh.in new file mode 100644 index 0000000..4d84734 --- /dev/null +++ b/contrib/pacsize.sh.in @@ -0,0 +1,159 @@ +#!/bin/sh +# pacsize -- display package sizes +# +# Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +readonly myname='pacsize' +readonly myver='@PACKAGE_VERSION@' + +calc_total () { + awk '{ + total += $1 + print +} +END { + printf ("%7s KIB TOTAL\n", total) +}' +} + +error () { + echo "$@" >&2 +} + +## Print size and name. We strip the arguably useless decimals. This makes +## output lighter. +filter () { + awk -F ": " \ + '$0 ~ "Name" { + pkg = $2 +} +$0 ~ "Installed Size" { + gsub (/[\.,].*/, "") + printf ("%7s KiB %s\n", $2, pkg) +}' +} + +remove_duplicates () { + awk '! table[$0]++' +} + +usage () { + cat <<EOF +Usage: ${1##*/} [OPTIONS] PACKAGES + ${1##*/} -a [OPTIONS] + +Display the size of PACKAGES. Duplicates are removed if any. The local database +is queried first; if the package is not found, the sync database is then used +for lookup. + +Options: + + -a: Process all installed packages. + -h: Show this help. + -n: Sort output by name. + -s: Sort output by size. + -t: Print total. + +Examples: + + $ ${1##*/} -ast + Convenient way to keep track of big packages. + + $ ${1##*/} \$(pactree -ld1 linux) + Print the size of linux and all its direct dependencies. + + $ ${1##*/} -st \$(pacman -Qdtq) + Print a grand total of orphan packages, and sort by size. +EOF +} + +version () { + echo "$myname $myver" + echo 'Copyright (C) 2014 Pierre Neidhardt <ambrevar(a)gmail.com>' +} + +opt_sort=false +opt_all=false +opt_total=false + +while getopts ":ahnstv" opt; do + case $opt in + a) + opt_all=true ;; + h) + usage "$0" + exit ;; + n) + opt_sort="sort -uk3" ;; + s) + opt_sort="sort -un" ;; + t) + opt_total="calc_total" ;; + v) + version "$0" + exit ;; + ?) + usage "$0" + exit 1 ;; + esac +done + +shift $(($OPTIND - 1)) + +## All-packages mode. +## We use a dedicated algorithm which is much faster than per-package mode. +## Unfortunately there is no easy way to select packages with this method. +if $opt_all; then + DBPath="$(awk -F = '/^ *DBPath/{print $2}' @sysconfdir@/pacman.conf 2>/dev/null)" + [ ! -d "$DBPath" ] && DBPath="@localstatedir@/lib/pacman" + + if [ ! -d "$DBPath/local/" ]; then + error "Could not find local database in $DBPath/local/." + exit 1 + fi + + awk '/^%NAME%/ { + getline + pkg=$0 +} +/^%SIZE%/ { + getline + size = $0 / 1024 + printf ("%6s KiB %s\n", size, pkg) +}' "$DBPath"/local/*/desc | ($opt_sort || cat) | ($opt_total || cat) + exit +fi + +## Per-package mode. +if [ $# -eq 0 ]; then + error "Missing argument." + usage "$0" + exit 1 +fi + +if ! command -v pacman >/dev/null 2>&1; then + error "'pacman' not found." + exit 1 +fi + +{ + ## If package is not found locally (-Q), we use the sync database (-S). We + ## use LC_ALL=C to make sure pacman output is not localized. + buffer=$(LC_ALL=C pacman -Qi "$@" 2>&1 1>&3 3>&- | cut -f2 -d "'") + [ -n "$buffer" ] && LC_ALL=C pacman -Si $buffer +} 3>&1 | filter | ($opt_sort || remove_duplicates) | ($opt_total || cat) + +# vim: set noet: -- 1.9.0

5 15

[pacman-dev] [PATCHv4 2/3] makepkg: Reorder some entries in usage() and getopts
by Pierre Neidhardt 05 Mar '14

05 Mar '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9d2b43f..6e634d9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2534,7 +2534,6 @@ usage() { printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" printf -- "$(gettext " -V, --version Show version information and exit")\n" printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" - printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" @@ -2549,12 +2548,13 @@ usage() { printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n" + printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" echo printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" - printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" + printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -2606,8 +2606,8 @@ while true; do case "$1" in # Pacman Options --asdeps) ASDEPS=1;; - --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --needed) NEEDED=1;; + --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options @@ -2637,10 +2637,10 @@ while true; do --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; + --sign) SIGNPKG='y' ;; --skipchecksums) SKIPCHECKSUMS=1 ;; --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; --skippgpcheck) SKIPPGPCHECK=1;; - --sign) SIGNPKG='y' ;; -s|--syncdeps) DEP_BIN=1 ;; -S|--source) SOURCEONLY=1 ;; --verifysource) VERIFYSOURCE=1 ;; -- 1.9.0

1 1

[pacman-dev] Another 4.1.x release?
by Allan McRae 05 Mar '14

05 Mar '14

Hi all, We are progressing well towards a 4.2 release in the next few months. In the meantime, do we want another 4.1 release? I have not been committing fixes to the maint branch lately, but I suppose there are a decent number on the master branch that could be backported. Allan

1 0

[pacman-dev] [PATCH] sync_prepare: ignore explicitly removed conflicts
by Andrew Gregory 04 Mar '14

04 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6ea78a0..31181e1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -566,6 +566,9 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* if conflict->package2 (the local package) is not elected for removal, we ask the user */ + if(alpm_pkg_find(trans->remove, conflict->package2)) { + found = 1; + } for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; if(alpm_pkg_find(spkg->removes, conflict->package2)) { -- 1.9.0

2 1

[pacman-dev] [PATCH] remove check for unused ALPM_ERR_PKG_IGNORED
by Andrew Gregory 03 Mar '14

03 Mar '14

alpm_add_pkg does not ignore packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc4baaf..bf19d57 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -566,9 +566,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET - || err == ALPM_ERR_PKG_IGNORED) { - /* just skip duplicate or ignored targets */ + if(err == ALPM_ERR_TRANS_DUP_TARGET) { + /* just skip duplicate targets */ pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); return 0; } else { -- 1.9.0

1 0

[pacman-dev] [PATCH] simplify check for leading "local/"
by Andrew Gregory 03 Mar '14

03 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 00bd3b3..933e6f7 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -94,13 +94,10 @@ int pacman_remove(alpm_list_t *targets) /* Step 1: add targets to the created transaction */ for(i = targets; i; i = alpm_list_next(i)) { char *target = i->data; - char *targ = strchr(target, '/'); - if(targ && strncmp(target, "local", 5) == 0) { - targ++; - } else { - targ = target; + if(strncmp(target, "local/", 6) == 0) { + target += 6; } - if(remove_target(targ) == -1) { + if(remove_target(target) == -1) { retval = 1; } } -- 1.9.0

1 0