June 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Document alpm_list files are to be stand alone
by Allan McRae 03 Jun '13

03 Jun '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 4 ++++ lib/libalpm/alpm_list.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index bcd42b8..59f99f9 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,6 +21,10 @@ #include <stdlib.h> #include <string.h> +/* Note: alpm_list.{c,h} are intended to be standalone files. Do not include + * any other libalpm headers. + */ + /* libalpm */ #include "alpm_list.h" diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 72c7378..3f3566b 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -22,6 +22,10 @@ #include <stdlib.h> /* size_t */ +/* Note: alpm_list.{c,h} are intended to be standalone files. Do not include + * any other libalpm headers. + */ + #ifdef __cplusplus extern "C" { #endif -- 1.8.3

1 0

[pacman-dev] [PATCH] die if '-' is given with empty stdin
by Andrew Gregory 03 Jun '13

03 Jun '13

Several operations default to all packages/repos/etc if no targets are provided. If a user provides '-' they almost certainly expect there to be targets on stdin and will be surprised if pacman falls back to the default because there are none. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 921331c..7aa0271 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -826,6 +826,7 @@ int main(int argc, char *argv[]) /* we support reading targets from stdin if a cmdline parameter is '-' */ if(alpm_list_find_str(pm_targets, "-")) { if(!isatty(fileno(stdin))) { + int target_found = 0; size_t current_size = PATH_MAX; char *vdata, *line = malloc(current_size); @@ -840,6 +841,7 @@ int main(int argc, char *argv[]) if(i > 0) { line[i] = '\0'; pm_targets = alpm_list_add(pm_targets, strdup(line)); + target_found = 1; i = 0; } } else { @@ -869,12 +871,18 @@ int main(int argc, char *argv[]) if(i > 0) { line[i] = '\0'; pm_targets = alpm_list_add(pm_targets, strdup(line)); + target_found = 1; } free(line); if(!freopen(ctermid(NULL), "r", stdin)) { pm_printf(ALPM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), strerror(errno)); } + + if(!target_found) { + pm_printf(ALPM_LOG_ERROR, _("argument '-' specified with empty stdin\n")); + cleanup(1); + } } else { /* do not read stdin from terminal */ pm_printf(ALPM_LOG_ERROR, _("argument '-' specified without input on stdin\n")); -- 1.8.3

2 1

[pacman-dev] [PATCH] repo-add; add option to remove existing package files from disk
by Phillip Smith 03 Jun '13

03 Jun '13

From: Phillip Smith <fukawi2(a)gmail.com> When maintaining a custom repo, often it is undesirable to retain older versions of packages. This patch adds the --remove option to remove the current package file and it's signature from disk before adding the new one to the database. Documentation is also updated. This is an optional flag and default behaviour (leaving ondisk files alone) is not changed. Signed-off-by: Phillip Smith <fukawi2(a)gmail.com> --- Updated patch to use sed instead of awk as per suggestion from Dave Reisner. doc/repo-add.8.txt | 6 ++++++ scripts/repo-add.sh.in | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 049195a..b06844b 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -75,6 +75,12 @@ repo-add Options Only add packages that are not already in the database. Warnings will be printed upon detection of existing packages, but they will not be re-added. +*-R, \--remove*:: + If an existing package with the same name exists in the database and on + disk, remove it from disk well as updating the database entry for the + package. This is designed to be Used when updating an existing package to + a new version. + See Also -------- linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4470dd0..962db3f 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -31,6 +31,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 ONLYADDNEW=0 +RMEXISTING=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -58,6 +59,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" + printf -- "$(gettext " -R, --remove remove any existing packages with the same name (eg, an older version)\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -304,6 +306,15 @@ db_write_entry() { local oldfilename=$(grep -A1 FILENAME "$pkgentry/desc" | tail -n1) local oldfile="$(dirname "$1")/$oldfilename" fi + elif (( RMEXISTING )); then + # only remove existing package if we're not doing deltas + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + local oldfilename="$(sed -n '/^%FILENAME%$/ {n;p;q;}' "$pkgentry/desc")" + local oldfile="$(dirname "$1")/$oldfilename" + msg2 "$(gettext "Removing existing package '%s'")" "$oldfilename" + rm -f ${oldfile} ${oldfile}.sig + fi fi fi @@ -611,6 +622,7 @@ while (( $# )); do -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; -n|--new) ONLYADDNEW=1;; + -R|--remove) RMEXISTING=1;; -f|--files) WITHFILES=1;; --nocolor) USE_COLOR='n';; -s|--sign) -- 1.8.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.1-43-gcbbd378
by allan＠archlinux.org 03 Jun '13

03 Jun '13

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 cbbd3781c249c8318934fe0810a09546c2760f53 (commit) via 47762ab687959e48acc2de8592fcf3ba3cfa502b (commit) via b1e495b88d77744085a6d0ea8d2b4480b9063409 (commit) via bc3e73fc8f7890d82c78c2ea54a63da440bac147 (commit) via c91d9484868f35e17dccc447d8c29cbb7978fb4f (commit) via 0b3d04719db189ad7dbc8b36b5f34d95a5c63646 (commit) via aa7e42db11ea545572a9519e88e2a6cdeeffb3bf (commit) via 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (commit) via 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (commit) from 9ca423b981c897c7d3894c5b394c23d786e4ba37 (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 cbbd3781c249c8318934fe0810a09546c2760f53 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Apr 12 22:26:14 2013 -0400 improve dir->file transition conflict resolution Packages removed due to conflicts are always removed at the beginning of the transaction and as such can be included in the check for whether all owners of a directory will be removed in a transaction. Installed versions of packages being upgraded, other than the one with the conflict, cannot be used because our transaction ordering is not intelligent enough to ensure that they are removed prior to the installation of the conflicted package. Also, return false from dir_belongsto_pkgs on errors. Previously, we simply continued which could return true even if we were unable to actually establish that the package owned the entire tree. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 47762ab687959e48acc2de8592fcf3ba3cfa502b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 13 17:31:08 2013 -0400 query_fileowner: remove symlink support Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1e495b88d77744085a6d0ea8d2b4480b9063409 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 10 15:25:49 2013 -0400 unlink_file: treat symlinks like normal files We always want to work with the package file itself, not its target if it's a symlink. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bc3e73fc8f7890d82c78c2ea54a63da440bac147 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 10 15:34:52 2013 -0400 extract_single_file: consolidate symlink cases Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c91d9484868f35e17dccc447d8c29cbb7978fb4f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri May 10 16:26:19 2013 -0400 conflict.c: check for file -> dir replacements Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0b3d04719db189ad7dbc8b36b5f34d95a5c63646 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri May 10 16:44:33 2013 -0400 conflict.c: exclude trailing slash from file path After the initial checks, we either use the path as a directory and have to append the trailing slash anyway or use it as a file in which case the trailing slash should be excluded. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa7e42db11ea545572a9519e88e2a6cdeeffb3bf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Apr 12 20:45:00 2013 -0400 conflict.c: do not ignore symlink<->dir conflicts Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Apr 12 20:37:56 2013 -0400 alpm_filelist: remove resolved_path Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 2 23:26:56 2013 -0500 update tests for symlink support removal Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 56 ++--- lib/libalpm/alpm.h | 3 +- lib/libalpm/conflict.c | 201 +++++++++--------- lib/libalpm/filelist.c | 225 +-------------------- lib/libalpm/filelist.h | 4 - lib/libalpm/package.c | 22 +- lib/libalpm/remove.c | 11 +- src/pacman/query.c | 137 ++++++------- test/pacman/tests/fileconflict007.py | 1 + test/pacman/tests/fileconflict013.py | 5 +- test/pacman/tests/fileconflict022.py | 1 - test/pacman/tests/fileconflict023.py | 7 +- test/pacman/tests/fileconflict025.py | 8 +- .../{fileconflict023.py => fileconflict030.py} | 11 +- test/pacman/tests/symlink001.py | 9 +- test/pacman/tests/symlink020.py | 20 ++ test/pacman/tests/sync700.py | 12 +- test/pacman/tests/sync701.py | 11 +- test/pacman/tests/sync702.py | 11 +- test/pacman/tests/upgrade045.py | 3 +- 20 files changed, 246 insertions(+), 512 deletions(-) copy test/pacman/tests/{fileconflict023.py => fileconflict030.py} (50%) create mode 100644 test/pacman/tests/symlink020.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add; add option to remove existing package files from disk
by Phillip Smith 02 Jun '13

02 Jun '13

From: Phillip Smith <fukawi2(a)gmail.com> when maintaining a custom repo, often it is undesirable to retain older versions of packages. this patch adds the --remove option to remove the current package file from disk before adding the new one to the database. Signed-off-by: Phillip Smith <fukawi2(a)gmail.com> --- scripts/repo-add.sh.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4470dd0..2fdb165 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -31,6 +31,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 ONLYADDNEW=0 +RMEXISTING=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -58,6 +59,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" + printf -- "$(gettext " -R, --remove remove any existing packages with the same name (eg, an older version)\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -304,6 +306,15 @@ db_write_entry() { local oldfilename=$(grep -A1 FILENAME "$pkgentry/desc" | tail -n1) local oldfile="$(dirname "$1")/$oldfilename" fi + elif (( RMEXISTING )); then + # only remove existing package if we're not doing deltas + pkgentry=$(find_pkgentry "$pkgname") + if [[ -n $pkgentry ]]; then + local oldfilename=$(grep -A1 FILENAME "$pkgentry/desc" | tail -n1) + local oldfile="$(dirname "$1")/$oldfilename" + warning "$(gettext "Removed existing file '%s'")" "$oldfilename" + rm -f $oldfile + fi fi fi @@ -611,6 +622,7 @@ while (( $# )); do -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; -n|--new) ONLYADDNEW=1;; + -R|--remove) RMEXISTING=1;; -f|--files) WITHFILES=1;; --nocolor) USE_COLOR='n';; -s|--sign) -- 1.8.2.3

5 17

[pacman-dev] makepkg proposal: passing arguments to VCS commands in new VCS pkgbuilds
by Ben Darwin 02 Jun '13

02 Jun '13

Specific use case: an upstream subversion repo requires --username anonsvn --password anonsvn --non-interactive (SVN apparently doesn't allow passing these parameters in the URI), and I want to use the new format for VCS packages. If there isn't an obvious way to do this already, would it make sense to add a variable, say $vcs_opts, to the makepkg API, which would be passed to the checkout commands in the download_git(), download_svn(), ..., functions? Ben

2 1

[pacman-dev] RFC: pacdiff finding pacnews through libalpm
by John Frazier 01 Jun '13

01 Jun '13

I made up a program to help find pacnews that are in odd locations. It includes a c utility based on vodiks pacrat. It uses libalpm to return the path to pacnews and pacsaves from all active configs in the local db. Then there is a version of pacdiff which has it run in place of find. This is better than the current find or locate used in pacdiff which doesn't look outside of /etc/ by default for performance reasons. With this pacdiff can find syslinux config in /boot, or avahi's db in /usr/lib with no noticeable delay. The only drawback I am aware of with using the local db is cannot find pacsaves unless the package is reinstalled. I think this would be a useful inclusion to the contrib tools, so let me know of what sucks about it and what it can be done to to get that accomplished. it currently is in github, but I can make up patches against pacman.git if wanted. https://github.com/JohnFrazier/pacnewrat John Frazier

4 4