- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-104-g50de701
by dan＠archlinux.org 20 Apr '11

20 Apr '11

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 50de7019c0bbd917b0a1717566ddad41c7c6db9e (commit) via c3f3d0b81ab3f36910b16a7aab5e787960ff20d7 (commit) via ecf15be0a760b6209bd3794a4d36b17282f97f70 (commit) via 84cfc135893546de8b4812d23f5db496331686ab (commit) via 3c8a448a2ff6b433059b1beb3a35cfd67c148d0c (commit) via dcb6fb224dd3ac91c08369e9fbff12349b96e545 (commit) via 18c73b00027128d535b89b5ccc8894f00669620c (commit) via 1995561f560f7dc4d978ccd00afc87d0a648cfe4 (commit) from efd8ae483fe587feccd32c90fbee474aa19a5557 (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 50de7019c0bbd917b0a1717566ddad41c7c6db9e Merge: c3f3d0b 18c73b0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 17:35:33 2011 -0500 Merge branch 'maint' commit c3f3d0b81ab3f36910b16a7aab5e787960ff20d7 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sun Feb 20 14:42:05 2011 +0100 Refactor display_targets for readability Row handling is moved to its own function in preparation for verbose package lists. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ecf15be0a760b6209bd3794a4d36b17282f97f70 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 17:32:16 2011 -0500 Remove outdated comments Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84cfc135893546de8b4812d23f5db496331686ab Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Thu Mar 24 23:34:17 2011 +0100 Use IEC unit prefixes Display {KiB, MiB, ...} instead of {KB, MB, ...} since that's what's actually being displayed. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c8a448a2ff6b433059b1beb3a35cfd67c148d0c Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sun Feb 20 19:38:32 2011 +0100 Add a utility function to humanize sizes Converts the given size in bytes in two possible ways: 1) target_unit is specified (!= 0): size is converted to target unit. 2) target_unit is not specified (== '\0'): size is converted to the first unit which will bring size to below 2048. If specified, label will point to the long label ('MB') if long_labels is set or the short label ('M') if it is not. Dan: use '\0' rather than 0 for the special value as a matter of coding style for char variables. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dcb6fb224dd3ac91c08369e9fbff12349b96e545 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Mar 25 00:15:44 2011 +0100 Remove ShowSize option Dan: The commit message originally referenced "VerbosePkgLists", but I'm going to change the name of the option. In addition, this patch serves a purpose being standalone- we should really do things like this with -S --print and hopefully -Q --print in the future. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++- README | 4 +- TODO.dan | 6 - configure.ac | 4 +- doc/index.txt | 1 + doc/pacman.conf.5.txt | 3 - etc/pacman.conf.in | 1 - lib/libalpm/po/ca.po | 42 ++++--- lib/libalpm/po/cs.po | 2 +- lib/libalpm/po/da.po | 2 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 10 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 248 +++++++++++++++++++------------------ lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 2 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb.po | 49 ++++---- lib/libalpm/po/pl.po | 41 +++--- lib/libalpm/po/pt.po | 38 +++--- lib/libalpm/po/pt_BR.po | 9 +- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 10 +- lib/libalpm/po/sk.po | 41 +++--- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr(a)latin.po | 2 +- lib/libalpm/po/sv.po | 2 +- lib/libalpm/po/tr.po | 2 +- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 2 +- po/ca.po | 208 ++++++++++++++++++------------- po/cs.po | 47 ++++---- po/da.po | 40 +++--- po/de.po | 58 +++++---- po/el.po | 64 +++++----- po/en_GB.po | 47 ++++--- po/es.po | 219 ++++++++++++++++---------------- po/fi.po | 277 ++++++++++++++++++++--------------------- po/fr.po | 49 ++++---- po/hu.po | 42 ++++--- po/it.po | 50 ++++---- po/kk.po | 41 +++---- po/nb.po | 297 +++++++++++++++++++++++++------------------- po/pacman.pot | 12 +- po/pl.po | 250 +++++++++++++++++++++---------------- po/pt.po | 211 ++++++++++++++++++------------- po/pt_BR.po | 55 +++++---- po/ro.po | 55 ++++---- po/ru.po | 48 ++++---- po/sk.po | 214 ++++++++++++++++++-------------- po/sr.po | 53 ++++---- po/sr(a)latin.po | 53 ++++---- po/sv.po | 41 +++--- po/tr.po | 49 ++++---- po/uk.po | 39 +++--- po/zh_CN.po | 43 ++++--- src/pacman/callback.c | 45 ++----- src/pacman/conf.h | 1 - src/pacman/package.c | 18 ++-- src/pacman/pacman.c | 3 - src/pacman/query.c | 8 -- src/pacman/sync.c | 8 -- src/pacman/util.c | 84 ++++++++---- src/pacman/util.h | 1 + 67 files changed, 1753 insertions(+), 1536 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] scripts/pacman-key.sh.in: fix processing of --help/-h and --version/-V options
by ivan.kanak＠gmail.com 20 Apr '11

20 Apr '11

From: Ivan Kanakarakis <ivan.kanak(a)gmail.com> ok, I think this is much better. The process is as follows: The script first tries to read the options as defined in the usage. It then expects to read a command. If the command exists and it's one of --help/-h/--version/-V it skips any check and goes straight to the case loop, and thus executes those. If the command is something else, it enters the big if block and checks for the needed conditions. also when an unknown command is given there now an error message instead of just the usage unknown command: <--the_command> some more comments: I saw some things like error "$(gettext "The key identified by %s doesn't exist")" "$1" while error() only knows about the first argument given to it, so %s there is actually left blank. also I think there are some cases where gettext is redundant as in called twice for the same text. I can go fixing this too. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> --- scripts/pacman-key.sh.in | 218 +++++++++++++++++++++++++--------------------- 1 files changed, 117 insertions(+), 101 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 89e52fc..9e0b73d 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -63,7 +63,7 @@ usage() { echo "$(gettext " -d, --del <keyid(s)> Remove the specified keyids")" echo "$(gettext " -e, --export <keyid(s)> Export the specified keyids")" echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" - echo "$(gettext " -h, --help This help")" + echo "$(gettext " -h, --help Display this help message")" echo "$(gettext " -l, --list List keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" @@ -211,115 +211,131 @@ if ! type gettext &>/dev/null; then } fi -if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != "" ]]; then - if type -p gpg >/dev/null 2>&1 = 1; then - error "$(gettext "gnupg does not seem to be installed.")" - msg2 "$(gettext "pacman-key requires gnupg for most operations.")" - exit 1 - elif (( EUID != 0 )); then - error "$(gettext "pacman-key needs to be run as root.")" - exit 1 - fi -fi - -# Parse global options +# Set default values CONFIG="@sysconfdir@/pacman.conf" PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" + +# Parse command line options while [[ $1 =~ ^--(config|gpgdir)$ ]]; do - case "$1" in - --config) shift; CONFIG="$1" ;; - --gpgdir) shift; PACMAN_KEYRING_DIR="$1" ;; - esac - shift + case "$1" in + --config) shift; cli_config="$1" + ;; + --gpgdir) shift; PACMAN_KEYRING_DIR="$1" + ;; + esac + shift done -if [[ ! -r "${CONFIG}" ]]; then - error "$(gettext "%s not found.")" "$CONFIG" - exit 1 -fi - -# Read GPGDIR from $CONFIG. -# The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign -# and the rest of the line. The string is splitted after the first occurrence of = -if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then - PACMAN_KEYRING_DIR="${GPGDIR}" -fi -GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" - -# Try to create $PACMAN_KEYRING_DIR if non-existent -# Check for simple existence rather than for a directory as someone may want -# to use a symlink here -[[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" - -# Parse and execute command +# Parse the command command="$1" if [[ -z "${command}" ]]; then - usage - exit 1 + usage + exit 1 fi shift +# If command is --help/-h or --version/-V then skip checks and execute those else +# check for: dependencies , permissions and state of needed directories and files +if [[ ! ${command} =~ ^(--help|-h|--version|-V)$ ]]; then + if ! type -p gpg &>/dev/null; then + error "$(gettext "gnupg does not seem to be installed.")" + msg2 "$(gettext "pacman-key requires gnupg for most operations.")" + exit 1 + fi + if (( EUID != 0 )); then + error "$(gettext "pacman-key needs to be run as root.")" + exit 1 + fi + # Try to create $PACMAN_KEYRING_DIR if non-existent + # Check for simple existence rather than for a directory as someone may want + # to use a symlink here + if [[ ! -e ${PACMAN_KEYRING_DIR} ]]; then + mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" + fi + # Check given configuration file. Failback to default configuration if the + # specified cannot be found or read. + if [[ ${cli_config} ]]; then + if [[ ! -r ${cli_config} ]]; then + error "$(gettext "Couldn't read configuration file: %s. Using default configuration.")" "$cli_config" + else + CONFIG="$cli_config" + fi + unset cli_config + fi + # Read GPGDIR from $CONFIG. + # The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign + # and the rest of the line. The string is splitted after the first occurrence of = + if [[ GPGDIR=$(find_config "GPGDir" &>/dev/null) ]]; then + PACMAN_KEYRING_DIR="${GPGDIR}" + fi +fi + +# Construct the command +GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" + +# Execute the command case "${command}" in - -a|--add) - # If there is no extra parameter, gpg will read stdin - ${GPG_PACMAN} --quiet --batch --import "$@" - ;; - -d|--del) - if (( $# == 0 )); then - error "$(gettext "You need to specify at least one key identifier")" - exit 1 - fi - ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" - ;; - -u|--updatedb) - ${GPG_PACMAN} --batch --check-trustdb - ;; - --reload) - reload_keyring - ;; - -l|--list) - ${GPG_PACMAN} --batch --list-sigs "$@" - ;; - -f|--finger) - ${GPG_PACMAN} --batch --fingerprint "$@" - ;; - -e|--export) - ${GPG_PACMAN} --armor --export "$@" - ;; - -r|--receive) - if (( $# < 2 )); then - error "$(gettext "You need to specify the keyserver and at least one key identifier")" - exit 1 - fi - keyserver="$1" - shift - ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" - ;; - -t|--trust) - if (( $# == 0 )); then - error "$(gettext "You need to specify at least one key identifier")" - exit 1 - fi - while (( $# > 0 )); do - # Verify if the key exists in pacman's keyring - if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then - ${GPG_PACMAN} --edit-key "$1" - else - error "$(gettext "The key identified by %s doesn't exist")" "$1" - exit 1 - fi - shift - done - ;; - --adv) - msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" - ${GPG_PACMAN} "$@" || ret=$? - exit $ret - ;; - -h|--help) - usage; exit 0 ;; - -V|--version) - version; exit 0 ;; - *) - usage; exit 1 ;; + -a|--add) + # If there is no extra parameter, gpg will read stdin + ${GPG_PACMAN} --quiet --batch --import "$@" + ;; + -d|--del) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one key identifier")" + exit 1 + fi + ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" + ;; + -u|--updatedb) + ${GPG_PACMAN} --batch --check-trustdb + ;; + --reload) + reload_keyring + ;; + -l|--list) + ${GPG_PACMAN} --batch --list-sigs "$@" + ;; + -f|--finger) + ${GPG_PACMAN} --batch --fingerprint "$@" + ;; + -e|--export) + ${GPG_PACMAN} --armor --export "$@" + ;; + -r|--receive) + if (( $# < 2 )); then + error "$(gettext "You need to specify the keyserver and at least one key identifier")" + exit 1 + fi + keyserver="$1" + shift + ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" + ;; + -t|--trust) + if (( $# == 0 )); then + error "$(gettext "You need to specify at least one key identifier")" + exit 1 + fi + while (( $# > 0 )); do + # Verify if the key exists in pacman's keyring + if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then + ${GPG_PACMAN} --edit-key "$1" + else + error "$(gettext "The key identified by %s doesn't exist")" "$1" + exit 1 + fi + shift + done + ;; + --adv) + msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" + ${GPG_PACMAN} "$@" || ret=$? + exit $ret + ;; + -h|--help) + usage; exit 0 ;; + -V|--version) + version; exit 0 ;; + *) + error "$(gettext "Unknown command: $command")" + usage; exit 1 ;; esac -- 1.7.4.2

3 3

[pacman-dev] [PATCH] Add more information in conflicts question
by Sebastian Nowicki 19 Apr '11

19 Apr '11

In addition to the names of the conflicting packages, the origin and versions will be displayed to the user. This introduces an API change in the PM_TRANS_CONV_CONFLICT_PKG conversation callback. All three arguments were strings. The first two arguments are now pmpkg_t structures (sync and local, respectively). Fixes FS#12536 --- In FS#12536 there was some discussion about changing pmconflict_t to contain pmpkg_t structures rather than just strings. This would be a much larger change, which I didn't think was worthwhile for a cosmetic change. Even so, this does introduce an API change, and a sneaky one at that. The conversation callback had three string arguments, now it has two pmpkg_t and a string. Due to these being all void pointers, end-users won't get any compiler warnings/errors if they don't update their code! Sample output without the patch applied: $ sudo pacman -S qemu-kvm resolving dependencies... looking for inter-conflicts... :: qemu-kvm and qemu are in conflict. Remove qemu? [y/N] n error: unresolvable package conflicts detected error: failed to prepare transaction (conflicting dependencies) :: qemu-kvm and qemu are in conflict Sample output with the patch applied: $ sudo ./src/pacman/pacman -S qemu-kvm resolving dependencies... looking for inter-conflicts... :: extra/qemu-kvm-0.14.0-1 and qemu-0.14.0-1 are in conflict. Remove qemu? [y/N] n error: unresolvable package conflicts detected error: failed to prepare transaction (conflicting dependencies) :: qemu-kvm and qemu are in conflict This patch was generated against master (commit d3d18a). lib/libalpm/sync.c | 4 ++-- src/pacman/callback.c | 31 +++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5428e40..4b54969 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -486,8 +486,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmpkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1); pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); int doremove = 0; - QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, - conflict->package2, conflict->reason, &doremove); + QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, sync, local, + conflict->reason, &doremove); if(doremove) { /* append to the removes list */ _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 08c1cf3..b253546 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -266,19 +266,30 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data2)); break; case PM_TRANS_CONV_CONFLICT_PKG: - /* data parameters: target package, local package, conflict (strings) */ + /* data parameters: target package, local package (pmpkg_t), conflict (string) */ /* print conflict only if it contains new information */ - if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { - *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), - (char *)data1, - (char *)data2, - (char *)data2); + if(strcmp(alpm_pkg_get_name(data1), data3) == 0 + || strcmp(alpm_pkg_get_name(data2), data3) == 0) { + *response = noyes(_(":: %s%s%s-%s and %s-%s are in conflict. Remove %s?"), + /* The db will be NULL if the package was read from file. */ + alpm_pkg_get_db(data1) == NULL ? "" : alpm_db_get_name(alpm_pkg_get_db(data1)), + alpm_pkg_get_db(data1) == NULL ? "" : "/", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1), + alpm_pkg_get_name(data2), + alpm_pkg_get_version(data2), + alpm_pkg_get_name(data2)); } else { - *response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), - (char *)data1, - (char *)data2, + *response = noyes(_(":: %s%s%s-%s and %s-%s are in conflict (%s). Remove %s?"), + /* The db will be NULL if the package was read from file. */ + alpm_pkg_get_db(data1) == NULL ? "" : alpm_db_get_name(alpm_pkg_get_db(data1)), + alpm_pkg_get_db(data1) == NULL ? "" : "/", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1), + alpm_pkg_get_name(data2), + alpm_pkg_get_version(data2), (char *)data3, - (char *)data2); + alpm_pkg_get_name(data2)); } break; case PM_TRANS_CONV_REMOVE_PKGS: -- 1.7.4.4

3 9

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.5.2, created. v3.5.2
by dan＠archlinux.org 18 Apr '11

18 Apr '11

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 annotated tag, v3.5.2 has been created at 8d9d8868a257d1a79be624396705f6faec0da364 (tag) tagging 18c73b00027128d535b89b5ccc8894f00669620c (commit) replaces v3.5.1 tagged by Dan McGee on Mon Apr 18 11:30:39 2011 -0500 - Log ----------------------------------------------------------------- 3.5.2 maint release, see NEWS for details -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk2sZzcACgkQXC5GoPU6du37+wCfZkjDyUwNIXjA8MWEd9ZWSKyW oxkAn0JiUeUPpYej/XfG3zBcZbGaqcVJ =RSdI -----END PGP SIGNATURE----- Allan McRae (2): makepkg: remove unnecessary tr usage makepkg: improve parsing for sanity checks Andrea Scarpino (1): call alpm_option_get_localdb once in syncfirst() Dan McGee (21): Update usage instruction strings Don't include version in dep string if mod == ANY Rework find_requiredby() to not use _alpm_dep_edge() Move alpm_find_dbs_satisfier() function down in deps.c Mark various functions in deps.c static Ensure reported missing dependencies show correct version comparison Clarify error message in pacman-db-upgrade Update pacman.pot with changed strings Update .mailmap file Add initial 3.5.2 notes Fix an outdated comment Ignore upcoming new values in sync backend Ensure dbpath is not null when populating sync database Add default changelog functions to pkg_operations Ensure stdout/stderr are flushed when asking questions test: fix invalid usage of 'type -p' Coding style cleanups bacman: fix the fact that the depends file no longer exists Remove Korean language translation files 3.5.2 translation updates from Transifex Final updates for 3.5.2 release Dave Reisner (2): alpm/db: do not close local DB in alpm_db_unregister_all makepkg: avoid usage of tr to sidestep locale issues Jan Steffens (1): Make log redirection saner Ray Kohler (1): Add -T, --deptest to usage message Rémy Oudompheng (18): alpm/handle.c: ensure handle is not NULL before proceeding Fix compatibility with older versions of libarchive. util.c: include limits.h for PATH_MAX macro db.c: set pm_errno appropriately in alpm_db_set_pkgreason() makepkg: fix a GNU-ism in awk usage diskspace: add the actually used statfs type in ifdefs libalpm: set pm_errno correctly in alpm_trans_get_flags() Fix broken documentation for alpm_trans_prepare() Move documentation of public transaction functions to alpm.h alpm.h: add documentation for package property accessors Move documentation of public database functions to alpm.h alpm.h: organize doxygen documentation in groups Move documentation for public package function to alpm.h alpm.h: more documentation for pkgreason, depend and errno. More documentation for option getters/setters. alpm.h: document transaction flags alpm.h: fix typos in documentation makepkg.sh.in: fix a GNU-ism in su invocation Xavier Chantry (3): libalpm/pkghash.c: unused variable ptr libalpm/be_local.c: unused variable ent pacman/query: correctly handle root files with -Qo ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-49-g18c73b0
by dan＠archlinux.org 18 Apr '11

18 Apr '11

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, maint has been updated via 18c73b00027128d535b89b5ccc8894f00669620c (commit) via 1995561f560f7dc4d978ccd00afc87d0a648cfe4 (commit) from 21a881ec6875dccf42bd602496fa93c5a61f2640 (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 18c73b00027128d535b89b5ccc8894f00669620c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 18 11:27:35 2011 -0500 Final updates for 3.5.2 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1995561f560f7dc4d978ccd00afc87d0a648cfe4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 18 11:19:13 2011 -0500 3.5.2 translation updates from Transifex And also a POT version and package version update. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++- configure.ac | 4 +- doc/index.txt | 1 + lib/libalpm/po/ca.po | 42 ++++--- lib/libalpm/po/cs.po | 2 +- lib/libalpm/po/da.po | 2 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 10 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 248 +++++++++++++++++++------------------ lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 2 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb.po | 49 ++++---- lib/libalpm/po/pl.po | 41 +++--- lib/libalpm/po/pt.po | 38 +++--- lib/libalpm/po/pt_BR.po | 9 +- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 10 +- lib/libalpm/po/sk.po | 41 +++--- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr(a)latin.po | 2 +- lib/libalpm/po/sv.po | 2 +- lib/libalpm/po/tr.po | 2 +- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 2 +- po/ca.po | 208 ++++++++++++++++++------------- po/cs.po | 47 ++++---- po/da.po | 40 +++--- po/de.po | 58 +++++---- po/el.po | 64 +++++----- po/en_GB.po | 47 ++++--- po/es.po | 219 ++++++++++++++++---------------- po/fi.po | 277 ++++++++++++++++++++--------------------- po/fr.po | 49 ++++---- po/hu.po | 42 ++++--- po/it.po | 50 ++++---- po/kk.po | 41 +++---- po/nb.po | 297 +++++++++++++++++++++++++------------------- po/pacman.pot | 12 +- po/pl.po | 250 +++++++++++++++++++++---------------- po/pt.po | 211 ++++++++++++++++++------------- po/pt_BR.po | 55 +++++---- po/ro.po | 55 ++++---- po/ru.po | 48 ++++---- po/sk.po | 214 ++++++++++++++++++-------------- po/sr.po | 53 ++++---- po/sr(a)latin.po | 53 ++++---- po/sv.po | 41 +++--- po/tr.po | 49 ++++---- po/uk.po | 39 +++--- po/zh_CN.po | 43 ++++--- 55 files changed, 1673 insertions(+), 1434 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Thoughts on database initialization and loading process
by Dan McGee 17 Apr '11

17 Apr '11

Hey guys, Hopefully someone has some insight, but I fear that this involves some pretty intimate knowledge with the alpm dirty internals. I implemented the local DB "version" check as something on the transaction process, due to the fact that we call get_pkgcache or find_package and all those fun methods all over the place with the expectation that they normally won't fail in any way. This was a bit of a hack, and has become more apparent as I look at some of the GPG issues. Due to the lazy loading of the package cache for databases, we never really know when a database may be initialized, or which call site will do so. This makes it hard for us to 1) do the local DB sanity check ASAP and in the right place, and 2) implement signature checking on databases each time it is accessed, which seems like the prudent decision to me. That leaves us with a few options: 1) Don't check database signatures every time, only when we "need to", e.g. right after download. Not a fan of this one. 2) Only check database signatures if we go through the transaction layer- just like we do now with the local version check. 3) Add some explicit alpm_dbs_set_in_stone() method that needs to be called before databases can be used, but after they are registered, that takes care of some bookkeeping stuff like this. Stinks because it introduces a rather kludgy API that depends on methods being called in procedural order (not to mention all frontends will need modification), but by far the easiest way to resolve this. 4) Fix callsites everywhere that may force a load of the pkgcache to actually check error return values for the "local db too old" and "gpg sig check failed" cases, among other, rather than just assuming the pkgcache is NULL without looking at pm_errno. Best solution as it requires no API change, but will definitely have a large LOC impact. Thoughts? -Dan

4 4

[pacman-dev] [PATCH 0/2] makepkg: finish package signing work
by Allan McRae 17 Apr '11

17 Apr '11

With these patches, I beleive the package signing work for makepkg is feature complete and all documentation provided. Allan McRae (2): Document makepkg package signing options Add configure option to specify package signing key doc/makepkg.8.txt | 12 ++++++++++++ doc/makepkg.conf.5.txt | 4 ++++ etc/makepkg.conf.in | 3 +++ scripts/makepkg.sh.in | 14 ++++++++------ 4 files changed, 27 insertions(+), 6 deletions(-) -- 1.7.4.4

1 2

[pacman-dev] update of Slovak translation
by Jozef Riha 16 Apr '11

16 Apr '11

please see the attachment. regards, jose

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-47-g21a881e
by dan＠archlinux.org 15 Apr '11

15 Apr '11

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, maint has been updated via 21a881ec6875dccf42bd602496fa93c5a61f2640 (commit) from a93e058b68187c92a57612b19f8773472d4ff9cb (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pacman/query.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-145-gefd8ae4
by dan＠archlinux.org 15 Apr '11

15 Apr '11

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 efd8ae483fe587feccd32c90fbee474aa19a5557 (commit) via 202ade1398ca57070e56de24c3639f3048ecd784 (commit) via 4ffda3f05b034b55eb5159e0268a34c14b46e686 (commit) via dff2d916baac88b71dec0af81645ea2fe876cf6c (commit) via dd8cf0c12dd5e8bf951933723558eadc5c6f04af (commit) via 21a881ec6875dccf42bd602496fa93c5a61f2640 (commit) via a93e058b68187c92a57612b19f8773472d4ff9cb (commit) via 8e8391e17c09a576896972c484b3d2194a7684c1 (commit) via fa9cd98ecf8eb7a9b87b82b1be4307dd8e2fe708 (commit) via 8df7208d7b0f4cec2421e9e167baaae4dea27bf7 (commit) via 31cb2100573c54c8996edbc8a7321d48b990c149 (commit) via dbd7d49d31d337d0b63d7945fd3308f903a75fd2 (commit) via b750d3e7b0b0d377ea856c7915f9c6acf6d512d8 (commit) via fa47dd96158563b5e6c50e637e2a12a58693dc10 (commit) via 6ebb6fec8b356c87e6fdea5659bbf34461adee90 (commit) via 3901ca1a6db773aeecb7a03271d99e87dabdfd45 (commit) via 96432ab4ef27bc6a570427736d8b7f439535e05f (commit) via 0c320b5a512b693479f2397b398f1298d7788567 (commit) via aac9e7c280a9686520e0f8f4bd7ffe4ed901716d (commit) via ff6f6027f09beaac9e387ca12f75583bba1dac21 (commit) via a479e0300baf48781d145e204e11a20059ad4caa (commit) via f8882839103442787c49b8021cfd8ae2784211ad (commit) from c5addd94e3a817504688e684bf62786df7faa3e7 (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 efd8ae483fe587feccd32c90fbee474aa19a5557 Merge: 202ade1 21a881e Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 15 18:41:49 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/alpm.h lib/libalpm/trans.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 202ade1398ca57070e56de24c3639f3048ecd784 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 15 18:40:32 2011 -0500 Include "config.h" in header files using off_t This makes it absolutely dead easy to ensure off_t has the same length in all compilation units. I just spent 2.5 hours bashing my head on an issue related to this so damn it I'm fixing it for good. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4ffda3f05b034b55eb5159e0268a34c14b46e686 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Apr 10 00:04:54 2011 +0200 libalpm: consistently use int as return type for option setters Currently the only error case then when handle == NULL. However several handle functions return -1 on this error, and a uniform API makes things simpler. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> commit dff2d916baac88b71dec0af81645ea2fe876cf6c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 28 12:54:47 2011 -0500 Remove indirection on get_name and get_version operations For a package to be loaded from any of our backends, these two fields are always required upfront. Due to this fact, we don't need them to be backend-specific operations and can just refer to the field directly. Additionally, our static (and thus private) cache package accessors had a NULL check on pkg before returning the relevant field. Eliminate this since they only way they are ever called is via the packages attached callback struct, which would have caused the NULL pointer dereference in the first place. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd8cf0c12dd5e8bf951933723558eadc5c6f04af Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 11 16:45:43 2011 -0500 Move graph.h functions into graph.c So we only need one copy in the final library, not one copy per time used. Ensure all necessary includes are in place (especially to get the right size of off_t each time it is compiled) by including "config.h" in the new graph.c. One small adjustment here makes the graph_free code more robust- ensure we don't have invalid pointers after each iteration by looking at the parents and children and adjusting accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8df7208d7b0f4cec2421e9e167baaae4dea27bf7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 11 15:56:34 2011 -0500 Don't create two pmpkg_t objects in be_package Ensure we only have one- this looks like the result of a bad merge from old 2008 signing code with the current stuff which has changed quite a bit. Originally-seen-by: Rémy Oudompheng <remyoudompheng(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: acinclude.m4 | 7 + contrib/bacman.in | 16 +- lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.h | 519 ++++++++++-- lib/libalpm/be_local.c | 19 - lib/libalpm/be_package.c | 19 - lib/libalpm/db.c | 65 +-- lib/libalpm/delta.h | 6 +- lib/libalpm/deps.c | 2 +- lib/libalpm/diskspace.c | 4 +- lib/libalpm/dload.c | 6 +- lib/libalpm/{graph.h => graph.c} | 38 +- lib/libalpm/graph.h | 32 +- lib/libalpm/handle.c | 97 ++- lib/libalpm/package.c | 54 +- lib/libalpm/package.h | 4 +- lib/libalpm/po/LINGUAS | 1 - lib/libalpm/po/ko.po | 548 ------------ lib/libalpm/remove.c | 8 + lib/libalpm/trans.c | 32 +- po/LINGUAS | 1 - po/ko.po | 1775 -------------------------------------- scripts/makepkg.sh.in | 2 +- src/pacman/pacman.c | 13 +- src/pacman/query.c | 50 +- 25 files changed, 648 insertions(+), 2672 deletions(-) copy lib/libalpm/{graph.h => graph.c} (55%) delete mode 100644 lib/libalpm/po/ko.po delete mode 100644 po/ko.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-46-ga93e058
by dan＠archlinux.org 15 Apr '11

15 Apr '11

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, maint has been updated via a93e058b68187c92a57612b19f8773472d4ff9cb (commit) via 8e8391e17c09a576896972c484b3d2194a7684c1 (commit) via fa9cd98ecf8eb7a9b87b82b1be4307dd8e2fe708 (commit) from 31cb2100573c54c8996edbc8a7321d48b990c149 (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 a93e058b68187c92a57612b19f8773472d4ff9cb Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Tue Apr 12 21:30:19 2011 +0200 makepkg.sh.in: fix a GNU-ism in su invocation GNU su supports the -c option to specify a command to execute. However, other flavours of su may have a different interpretation of the '-c' flag (e.g. FreeBSD and OpenBSD). The behaviour is correct when '-c' follows an explicit username. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e8391e17c09a576896972c484b3d2194a7684c1 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sat Apr 9 23:28:00 2011 +0200 alpm.h: fix typos in documentation Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> commit fa9cd98ecf8eb7a9b87b82b1be4307dd8e2fe708 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 12 01:33:19 2011 -0500 Remove Korean language translation files There is no actual translation done here yet, just a dormant Transifex language with nothing checked in. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 2 +- lib/libalpm/po/LINGUAS | 1 - lib/libalpm/po/ko.po | 548 --------------- po/LINGUAS | 1 - po/ko.po | 1775 ------------------------------------------------ scripts/makepkg.sh.in | 2 +- 6 files changed, 2 insertions(+), 2327 deletions(-) delete mode 100644 lib/libalpm/po/ko.po delete mode 100644 po/ko.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] Pacman 3.5.2 string freeze
by Dan McGee 15 Apr '11

15 Apr '11

This is a message to all past/present/future translators that I'd like to do the pacman 3.5.2 release around the end of this week, so if you could take a look at the translations and get them up to date that would be great: https://www.transifex.net/projects/p/archlinux-pacman/r/3-5-2/ There are only a handful of new and/or changed strings (6 to 20 depending on the language and last update), so updating should be quick for most languages. There are also a handful of languages that have not seen an update in a bit, and would appreciate your help: Catalan, Danish, Portuguese, Slovak, Swedish, Ukrainian, and Norwegian Bokmål. To the German translator, as I got no feedback after the initial comment: https://bugs.archlinux.org/task/23575 Thanks everyone! Please direct your questions/comments to the pacman-dev ML or include me in any replies as I no longer receive arch-general mailing list posts. -Dan

1 1

[pacman-dev] pyalpm 0.4
by Rémy Oudompheng 15 Apr '11

15 Apr '11

Hello, I am pleased to announce that I tagged version 0.4 of pyalpm. Pyalpm is a personal project based on initial code by Imanol Celaya to deliver Python bindings for libalpm. It runs on Python 3.2 (the C library is probably compatible with Python 3.1) and currently wraps most of libalpm API from pacman 3.5. New features since version 0.2 include : * wrapping of transaction functions (allowing to install/upgrade/remove packages) * allowing most libalpm callbacks to be Python functions * pycman now supports almost all pacman options Pyalpm also includes a nearly full-featured rewrite of pacman in python, dubbed "pycman". The goals of "pycman" are multiple: * be identical in usage with pacman (except for the ugly output and user non-interaction) * ensure pyalpm wraps enough functions to be able to develop a package managing front-end on top of it * have a quicker overview of source code that replicates pacman's behaviour * help testing pyalpm with real world usage * demonstrate code snippets for basic usage of pyalpm * serve as a basis for quickly hacking a variant of pacman * provide a Python library that reads and applies settings from pacman.conf Pyalpm can be found at ftp://ftp.archlinux.org/other/pyalpm/pyalpm-0.4.tar.gz (when FTP site will be synchronized) and is meant to be compilable on other platforms than Archlinux, possibly with modifications to CPPFLAGS. A PKGBUILD is available on AUR for Archlinux users. Regards, Rémy.

5 5

[pacman-dev] [PATCH] makepkg.sh.in: fix a GNU-ism in su invocation
by Rémy Oudompheng 13 Apr '11

13 Apr '11

GNU su supports the -c option to specify a command to execute. However, other flavours of su may have a different interpretation of the '-c' flag (e.g. FreeBSD and OpenBSD). The behaviour is correct when '-c' follows an explicit username. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- See for example: * OpenBSD manpage at http://www.openbsd.org/cgi-bin/man.cgi?query=su * FreeBSD manpage at http://www.freebsd.org/cgi/man.cgi?query=su On branch 'maint' 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 1c8c50e..69922c9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -394,7 +394,7 @@ run_pacman() { if [ "$(type -p sudo)" ]; then cmd="sudo $cmd" else - cmd="su -c '$cmd'" + cmd="su root -c '$cmd'" fi fi eval "$cmd" -- 1.7.4.4

2 1

[pacman-dev] alpm_add_pkg() stealing ownership of allocated objects
by Rémy Oudompheng 12 Apr '11

12 Apr '11

Hello, While doing experiments, I discovered that alpm_add_pkg() seemingly stole the ownership of a pmpkg_t previously allocated by alpm_pkg_load(). I am a bit confused here. I think the documentation can definitely be improved here: can someone confirm the following statements? * a pmpkg_t* returned by alpm_pkg_load() must be freed by the caller unless otherwise specified * if alpm_add_pkg() is called on that package, then the caller MUST NOT free the pmpkg_t afterwards. Am I right? Are there any other functions with similar behaviour to alpm_add_pkg() ? Regards, Rémy.

2 2

[pacman-dev] Community repository trouble in Pacman
by Vladyslav Chyzhevskyi 12 Apr '11

12 Apr '11

Hello, I have a problem with Community repository in Pacman. Forever, when I try to update my system, or to install packages from [Community], Pacman return next error message: [coirius@atom ~]$ sudo pacman -S hwinfo error: could not open file /var/lib/pacman/sync/community.db: (Empty error message) error: target not found: hwinfo Who knowns how to resorve this trouble? Thx.

2 1

[pacman-dev] Newsletter Tue, 12 Apr 2011 02:41:14 -0800
by jason＠archlinux.org 12 Apr '11

12 Apr '11

Hello! Do you want a more satisfactory future, go up in money earning, and the praise of all? Special offer: We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience. Get a Degree in 5 weeks with our program! ~Our program will let ANYONE with professional experience get a 100% verified Degree: ~Doctorate ~Bachelors ~Masters - Think about it... - You can realize YOUR Dreams! - Live a much better life by earning or upgrading your degree. This is a rare way to make a right move and receive your due benefits... if you are qualified but are lacking that piece of paper. Get one from us in a fraction of the time. Call Us to start improving your life! ~CALL US~ 1-310-205-2502 Please leave us a message with your phone number with country code if outside USA and name and we will contact you asap. It is your way... Make the right move. Best regards. Do Not Reply to this Email. We do not reply to text inquiries, and our server will reject all response traffic. We apologize for any inconvenience this may have caused you.

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-43-g31cb210
by dan＠archlinux.org 12 Apr '11

12 Apr '11

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, maint has been updated via 31cb2100573c54c8996edbc8a7321d48b990c149 (commit) via dbd7d49d31d337d0b63d7945fd3308f903a75fd2 (commit) from b750d3e7b0b0d377ea856c7915f9c6acf6d512d8 (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 31cb2100573c54c8996edbc8a7321d48b990c149 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 9 17:26:55 2011 -0500 bacman: fix the fact that the depends file no longer exists Addresses FS#23641. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbd7d49d31d337d0b63d7945fd3308f903a75fd2 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sat Apr 9 23:28:00 2011 +0200 alpm.h: document transaction flags Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 16 +++++++--------- lib/libalpm/alpm.h | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/4] Make gpgme optional
by Rémy Oudompheng 11 Apr '11

11 Apr '11

These patches (partially already submitted before) make linking with gpgme optional, and also implement a configuration option for pacman to use an external tool for signature checking. The given example is "gpg --verify - $filename", but "/bin/true" could be used to totally bypass checking. To apply on branch 'master', after the previously posted patch set. Rémy Oudompheng (4): handle: define a new callback for signature check signing: make gpgme optional and default to user callback pacman: add a configuration key for signature checking command pacman: implement signature check callback using an external command configure.ac | 19 ++++++++++- etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 12 +++++++ lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 13 ++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/signing.c | 33 +++++++++++++++++++-- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 6 ++- src/pacman/callback.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/callback.h | 3 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 4 ++ 13 files changed, 167 insertions(+), 8 deletions(-) -- 1.7.4.4

2 7

[pacman-dev] [PATCH 0/3] Signature checks for local packages
by Rémy Oudompheng 11 Apr '11

11 Apr '11

These patches fix the way local packages have their signatures checked by libalpm. Rémy Oudompheng (3): libalpm: correctly load signatures for package files libalpm: add a public function to get signature contents sync.c: check signatures for local package files when available lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 18 +++++------------- lib/libalpm/signing.c | 6 ++++++ lib/libalpm/sync.c | 19 ++++++++++++++----- 4 files changed, 26 insertions(+), 18 deletions(-) -- 1.7.4.4

2 4

[pacman-dev] [PATCH] libalpm: consistently use int as return type for option setters
by Rémy Oudompheng 11 Apr '11

11 Apr '11

Currently the only error case is when handle == NULL. However several handle functions return -1 on this error, and a uniform API makes things simpler. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- This patch introduces an API change. On branch 'master' lib/libalpm/alpm.h | 34 +++++++++--------- lib/libalpm/handle.c | 97 ++++++++++++++++++++++++++----------------------- src/pacman/pacman.c | 13 ++++--- 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b08191d..82eb11e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -99,16 +99,16 @@ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, */ alpm_cb_log alpm_option_get_logcb(void); -void alpm_option_set_logcb(alpm_cb_log cb); +int alpm_option_set_logcb(alpm_cb_log cb); alpm_cb_download alpm_option_get_dlcb(void); -void alpm_option_set_dlcb(alpm_cb_download cb); +int alpm_option_set_dlcb(alpm_cb_download cb); alpm_cb_fetch alpm_option_get_fetchcb(void); -void alpm_option_set_fetchcb(alpm_cb_fetch cb); +int alpm_option_set_fetchcb(alpm_cb_fetch cb); alpm_cb_totaldl alpm_option_get_totaldlcb(void); -void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); +int alpm_option_set_totaldlcb(alpm_cb_totaldl cb); const char *alpm_option_get_root(void); int alpm_option_set_root(const char *root); @@ -118,7 +118,7 @@ int alpm_option_set_dbpath(const char *dbpath); alpm_list_t *alpm_option_get_cachedirs(void); int alpm_option_add_cachedir(const char *cachedir); -void alpm_option_set_cachedirs(alpm_list_t *cachedirs); +int alpm_option_set_cachedirs(alpm_list_t *cachedirs); int alpm_option_remove_cachedir(const char *cachedir); const char *alpm_option_get_logfile(void); @@ -131,36 +131,36 @@ const char *alpm_option_get_signaturedir(void); int alpm_option_set_signaturedir(const char *signaturedir); int alpm_option_get_usesyslog(void); -void alpm_option_set_usesyslog(int usesyslog); +int alpm_option_set_usesyslog(int usesyslog); alpm_list_t *alpm_option_get_noupgrades(void); -void alpm_option_add_noupgrade(const char *pkg); -void alpm_option_set_noupgrades(alpm_list_t *noupgrade); +int alpm_option_add_noupgrade(const char *pkg); +int alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); alpm_list_t *alpm_option_get_noextracts(void); -void alpm_option_add_noextract(const char *pkg); -void alpm_option_set_noextracts(alpm_list_t *noextract); +int alpm_option_add_noextract(const char *pkg); +int alpm_option_set_noextracts(alpm_list_t *noextract); int alpm_option_remove_noextract(const char *pkg); alpm_list_t *alpm_option_get_ignorepkgs(void); -void alpm_option_add_ignorepkg(const char *pkg); -void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); +int alpm_option_add_ignorepkg(const char *pkg); +int alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); alpm_list_t *alpm_option_get_ignoregrps(void); -void alpm_option_add_ignoregrp(const char *grp); -void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); +int alpm_option_add_ignoregrp(const char *grp); +int alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); const char *alpm_option_get_arch(void); -void alpm_option_set_arch(const char *arch); +int alpm_option_set_arch(const char *arch); int alpm_option_get_usedelta(void); -void alpm_option_set_usedelta(int usedelta); +int alpm_option_set_usedelta(int usedelta); int alpm_option_get_checkspace(void); -void alpm_option_set_checkspace(int checkspace); +int alpm_option_set_checkspace(int checkspace); pmdb_t *alpm_option_get_localdb(void); alpm_list_t *alpm_option_get_syncdbs(void); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index fd40f19..b55b02a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -274,40 +274,32 @@ alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() return handle->dbs_sync; } -void SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb) +int SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->logcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) +int SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->dlcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb) +int SYMEXPORT alpm_option_set_fetchcb(alpm_cb_fetch cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->fetchcb = cb; + return 0; } -void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) +int SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) { - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return; - } + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->totaldlcb = cb; + return 0; } int SYMEXPORT alpm_option_set_root(const char *root) @@ -420,11 +412,12 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) return 0; } -void SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) +int SYMEXPORT alpm_option_set_cachedirs(alpm_list_t *cachedirs) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->cachedirs) FREELIST(handle->cachedirs); if(cachedirs) handle->cachedirs = cachedirs; + return 0; } int SYMEXPORT alpm_option_remove_cachedir(const char *cachedir) @@ -495,23 +488,26 @@ int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir) return 0; } -void SYMEXPORT alpm_option_set_usesyslog(int usesyslog) +int SYMEXPORT alpm_option_set_usesyslog(int usesyslog) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->usesyslog = usesyslog; + return 0; } -void SYMEXPORT alpm_option_add_noupgrade(const char *pkg) +int SYMEXPORT alpm_option_add_noupgrade(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) +int SYMEXPORT alpm_option_set_noupgrades(alpm_list_t *noupgrade) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->noupgrade) FREELIST(handle->noupgrade); if(noupgrade) handle->noupgrade = noupgrade; + return 0; } int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) @@ -526,17 +522,19 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_noextract(const char *pkg) +int SYMEXPORT alpm_option_add_noextract(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) +int SYMEXPORT alpm_option_set_noextracts(alpm_list_t *noextract) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->noextract) FREELIST(handle->noextract); if(noextract) handle->noextract = noextract; + return 0; } int SYMEXPORT alpm_option_remove_noextract(const char *pkg) @@ -551,17 +549,19 @@ int SYMEXPORT alpm_option_remove_noextract(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) +int SYMEXPORT alpm_option_add_ignorepkg(const char *pkg) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); + return 0; } -void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) +int SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->ignorepkg) FREELIST(handle->ignorepkg); if(ignorepkgs) handle->ignorepkg = ignorepkgs; + return 0; } int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) @@ -576,17 +576,19 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) return 0; } -void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) +int SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); + return 0; } -void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) +int SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(ignoregrps) handle->ignoregrp = ignoregrps; + return 0; } int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) @@ -601,23 +603,26 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) return 0; } -void SYMEXPORT alpm_option_set_arch(const char *arch) +int SYMEXPORT alpm_option_set_arch(const char *arch) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(handle->arch) FREE(handle->arch); if(arch) handle->arch = strdup(arch); + return 0; } -void SYMEXPORT alpm_option_set_usedelta(int usedelta) +int SYMEXPORT alpm_option_set_usedelta(int usedelta) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->usedelta = usedelta; + return 0; } -void SYMEXPORT alpm_option_set_checkspace(int checkspace) +int SYMEXPORT alpm_option_set_checkspace(int checkspace) { - ASSERT(handle != NULL, RET_ERR_VOID(PM_ERR_HANDLE_NULL)); + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); handle->checkspace = checkspace; + return 0; } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 74659c5..c5c83d7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -412,7 +412,7 @@ static void setlibpaths(void) #define check_optarg() if(!optarg) { return 1; } -typedef void (*fn_add) (const char *s); +typedef int (*fn_add) (const char *s); static int parsearg_util_addlist(fn_add fn) { @@ -810,17 +810,19 @@ static int parseargs(int argc, char *argv[]) } /* helper for being used with setrepeatingoption */ -static void option_add_holdpkg(const char *name) { +static int option_add_holdpkg(const char *name) { config->holdpkg = alpm_list_add(config->holdpkg, strdup(name)); + return 0; } /* helper for being used with setrepeatingoption */ -static void option_add_syncfirst(const char *name) { +static int option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); + return 0; } /* helper for being used with setrepeatingoption */ -static void option_add_cleanmethod(const char *value) { +static int option_add_cleanmethod(const char *value) { if (strcmp(value, "KeepInstalled") == 0) { config->cleanmethod |= PM_CLEAN_KEEPINST; } else if (strcmp(value, "KeepCurrent") == 0) { @@ -829,6 +831,7 @@ static void option_add_cleanmethod(const char *value) { pm_printf(PM_LOG_ERROR, _("invalid value for 'CleanMethod' : '%s'\n"), value); } + return 0; } /** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm @@ -839,7 +842,7 @@ static void option_add_cleanmethod(const char *value) { * @param optionfunc a function pointer to an alpm_option_add_* function */ static void setrepeatingoption(char *ptr, const char *option, - void (*optionfunc)(const char*)) + int (*optionfunc)(const char*)) { char *q; -- 1.7.4.4

2 1

[pacman-dev] Newsletter Mon, 11 Apr 2011 15:17:55 -0300
by dan＠archlinux.org 11 Apr '11

11 Apr '11

How are you bud! Do you want an effective future, increase in money earning, and the recognition of all? Today only: We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience. Get a Degree in 4 weeks with our program! ~Our program will let EVERYONE with professional experience get a 100% verified Degree: ~Doctorate ~Bachelors ~Masters - Think about it... - You can realize YOUR Dreams! - Live a much better life by earning or upgrading your degree. This is a splendid chance to make a right move and receive your due benefits... if you are qualified but are lacking that piece of paper. Get one from us in a fraction of the time. Call 7 days a week! to start improving your life! ~CALL US~ 1-310-205-2502 Please leave us a message with your name and phone number with country code if outside USA and we'll call you asap. It's your decision... Make the right decision. Best wishes. Do Not Reply to this Email. We do not reply to text inquiries, and our server will reject all response traffic. We apologize for any inconvenience this may have caused you.

1 0

[pacman-dev] [PATCH] alpm.h: document transaction flags
by Rémy Oudompheng 10 Apr '11

10 Apr '11

Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- This documentation is inspired from pacma's help strings. Note that the help string for pacman -Ru is highly misleading is the sense that it does not clearly state that it *filters* the input package list. lib/libalpm/alpm.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1bb0b81..cb643d2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -579,23 +579,39 @@ pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync); /** Transaction flags */ typedef enum _pmtransflag_t { + /** Ignore dependency checks. */ PM_TRANS_FLAG_NODEPS = 1, + /** Ignore file conflicts and overwrite files. */ PM_TRANS_FLAG_FORCE = (1 << 1), + /** Delete files even if they are tagged as backup. */ PM_TRANS_FLAG_NOSAVE = (1 << 2), + /** Ignore version numbers when checking dependencies. */ PM_TRANS_FLAG_NODEPVERSION = (1 << 3), + /** Remove also any packages depending on a package being removed. */ PM_TRANS_FLAG_CASCADE = (1 << 4), + /** Remove packages and their unneeded deps (not explicitly installed). */ PM_TRANS_FLAG_RECURSE = (1 << 5), + /** Modify database but do not commit changes to the filesystem. */ PM_TRANS_FLAG_DBONLY = (1 << 6), /* (1 << 7) flag can go here */ + /** Use PM_PKG_REASON_DEPEND when installing packages. */ PM_TRANS_FLAG_ALLDEPS = (1 << 8), + /** Only download packages and do not actually install. */ PM_TRANS_FLAG_DOWNLOADONLY = (1 << 9), + /** Do not execute install scriptlets after installing. */ PM_TRANS_FLAG_NOSCRIPTLET = (1 << 10), + /** Ignore dependency conflicts. */ PM_TRANS_FLAG_NOCONFLICTS = (1 << 11), /* (1 << 12) flag can go here */ + /** Do not install a package if it is already installed and up to date. */ PM_TRANS_FLAG_NEEDED = (1 << 13), + /** Use PM_PKG_REASON_EXPLICIT when installing packages. */ PM_TRANS_FLAG_ALLEXPLICIT = (1 << 14), + /** Do not remove a package if it is needed by another one. */ PM_TRANS_FLAG_UNNEEDED = (1 << 15), + /** Remove also explicitly installed unneeded deps (use with PM_TRANS_FLAG_RECURSE). */ PM_TRANS_FLAG_RECURSEALL = (1 << 16), + /** Do not lock the database during the operation. */ PM_TRANS_FLAG_NOLOCK = (1 << 17) } pmtransflag_t; -- 1.7.4.4

1 0

[pacman-dev] [PATCH 3/7] libalpm: switch default VerifySig to Optional
by Xavier Chantry 10 Apr '11

10 Apr '11

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- lib/libalpm/alpm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b08191d..81877cc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -254,8 +254,8 @@ int alpm_db_check_pgp_signature(pmdb_t *db); /* GPG signature verification option */ typedef enum _pgp_verify_t { - PM_PGP_VERIFY_ALWAYS, PM_PGP_VERIFY_OPTIONAL, + PM_PGP_VERIFY_ALWAYS, PM_PGP_VERIFY_NEVER } pgp_verify_t; -- 1.7.4.2

2 2

[pacman-dev] [PATCH] Fix broken documentation for alpm_trans_prepare()
by Rémy Oudompheng 10 Apr '11

10 Apr '11

The current state of the code does not allow to see immediately that it returns a list of pmdepmissing_t structures. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- alpm_trans_prepare() is really unusable if the type of its return value is obfuscated like this. This patch applies on branch "maint". lib/libalpm/deps.c | 2 +- lib/libalpm/remove.c | 8 ++++++++ lib/libalpm/trans.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index dc85b31..36d6e1a 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -261,7 +261,7 @@ pmpkg_t SYMEXPORT *alpm_find_satisfier(alpm_list_t *pkgs, const char *depstring) * @param reversedeps handles the backward dependencies * @param remove an alpm_list_t* of packages to be removed * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade) - * @return an alpm_list_t* of pmpkg_t* of pmdepmissing_t pointers. + * @return an alpm_list_t* of pmdepmissing_t pointers. */ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, alpm_list_t *remove, alpm_list_t *upgrade) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 5def92a..7c8a99f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -129,6 +129,14 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, } } +/** Transaction preparation for remove actions. + * This function takes a pointer to a alpm_list_t which will be + * filled with a list of pmdepmissing_t* objects representing + * the packages blocking the transaction. + * @param trans the transaction object + * @param db the database of local packages + * @param data a pointer to an alpm_list_t* to fill + */ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { alpm_list_t *lp; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 08856d0..309a56a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -177,8 +177,8 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) } /** Prepare a transaction. - * @param data the address of an alpm_list where detailed description - * of an error can be dumped (ie. list of conflicting files) + * @param data the address of an alpm_list where a list + * of pmdepmissing_t objects is dumped (conflicting packages) * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data) -- 1.7.4.4

2 1