- Pacman-dev - lists.archlinux.org

[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

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

31 May '13

From: Phillip Smith <fukawi2(a)gmail.com> ==== Updated this patch to remove the sig file, use awk instead of grep/tail and updated documentation too. ==== 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> --- 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..91574b3 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="$(awk '/%FILENAME%/ {getline; print}' "$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.2.3

2 4

[pacman-dev] [PATCH] Add the ability to always build from the repo's HEAD
by Techlive Zheng 30 May '13

30 May '13

--- A task has also been added: https://bugs.archlinux.org/task/35499 scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c27c74d..cd7ed48 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -557,6 +557,9 @@ download_git() { if ! git fetch --all -p; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" + else + git fetch origin HEAD + echo "$(git rev-parse FETCH_HEAD)" > HEAD fi fi } @@ -597,6 +600,9 @@ extract_git() { branch) ref=origin/${fragment##*=} ;; + HEAD) + ref=HEAD + ;; *) error "$(gettext "Unrecognized reference: %s")" "${fragment}" plain "$(gettext "Aborting...")" @@ -604,6 +610,8 @@ extract_git() { esac fi + ref=$(git rev-parse "$ref") + if [[ -n $ref ]]; then if ! git checkout -b makepkg $ref; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" -- 1.8.2.3

3 7

[pacman-dev] optdepends and pacman -Qdt
by 郑文辉(Techlive Zheng) 30 May '13

30 May '13

When packages listed in a package's 'optdepeds' field are installed using `--asdeps` option, as long as the package which list these packages as 'optdepends' exists, these packages should not be listed bu `pacman -Qdt`.

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.1-34-g9ca423b
by allan＠archlinux.org 30 May '13

30 May '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 9ca423b981c897c7d3894c5b394c23d786e4ba37 (commit) via 5df5d2c411f34d6a893a83cdc464747374642f75 (commit) via 477fd794a06d8f42c97e6ff1c251736b505d32a0 (commit) via a36d4b2831fdb36a0c8ddaec5a023104932df73d (commit) via cbc25c22fcb8ea12ba98386e1489bf8f02e4e86a (commit) via ce3125196d98baf054e841ea3fb368d81df645e1 (commit) from 7ea58d09f69a9a13b637e7128e7b882ac2bebc64 (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 9ca423b981c897c7d3894c5b394c23d786e4ba37 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Wed May 29 14:03:29 2013 +0200 Revise pacman(8) Resolve several grammatical errors and minor formatting consistency issues in pacman(8). Generalize the "FTP servers" and package file extension information. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5df5d2c411f34d6a893a83cdc464747374642f75 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Wed May 29 14:26:25 2013 +0200 Revise PKGBUILD(5) Resolve several grammatical errors and minor formatting consistency issues in PKGBUILD(5). Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 477fd794a06d8f42c97e6ff1c251736b505d32a0 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed May 29 14:51:24 2013 +0200 makepkg-template: add --version and some license info Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a36d4b2831fdb36a0c8ddaec5a023104932df73d Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed May 22 16:35:23 2013 +0200 makepkg-template: Stop using given/when given/when has been marked experimental in perl 5.18 because it will change it 5.20. if/else is ugly, but hiding the generated warning is no good solution either, so we us if/else for now. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cbc25c22fcb8ea12ba98386e1489bf8f02e4e86a Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun May 19 12:17:57 2013 +0200 makepkg-template: Add gettext support This also slighty changes the word order in the description for --newest. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce3125196d98baf054e841ea3fb368d81df645e1 Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed May 1 00:18:17 2013 +0200 Add makepkg-template This allows for somewhat easy templating for PKGBUILDs. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 19 ++++ doc/.gitignore | 1 + doc/Makefile.am | 4 + doc/PKGBUILD.5.txt | 132 +++++++++++++------------ doc/footer.txt | 2 +- doc/makepkg-template.1.txt | 120 +++++++++++++++++++++++ doc/pacman.8.txt | 146 ++++++++++++++-------------- scripts/.gitignore | 1 + scripts/Makefile.am | 11 +++ scripts/makepkg-template.pl.in | 212 +++++++++++++++++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 11 files changed, 513 insertions(+), 136 deletions(-) create mode 100644 doc/makepkg-template.1.txt create mode 100755 scripts/makepkg-template.pl.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Letter case in pacman output
by Jason St. John 29 May '13

29 May '13

I briefly talked with Allan on IRC about changing letter casing in pacman's output (e.g. when running 'pacman -Qi'), and he stated that I should gather feedback on the mailing list. I would like to change from using title case to using sentence case where appropriate. An example of the change would be the following snippet from 'pacman -Qi'. ** Currently: Depends On : coreutils linux-firmware kmod mkinitcpio>=0.7 Optional Deps : crda: to set the correct wireless channels of your country [installed] Required By : None Optional For : None Conflicts With : kernel26 Replaces : kernel26 Installed Size : 65562.00 KiB ** After the proposed change: Depends on : coreutils linux-firmware kmod mkinitcpio>=0.7 Optional deps : crda: to set the correct wireless channels of your country [installed] Required by : None Optional for : None Conflicts with : kernel26 Replaces : kernel26 Installed size : 65562.00 KiB Pros: I think it looks better aesthetically (although Allan disagrees) and looks more professional. Cons: Increased workload for translators for the next pacman release. Jason

4 4

[pacman-dev] [PATCH] removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h
by Paul Barbu Gheorghe 29 May '13

29 May '13

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm_list.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..b9e7cba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,13 +21,11 @@ #include <stdlib.h> #include <string.h> +#include "util.h" + /* libalpm */ #include "alpm_list.h" -/* check exported library symbols with: nm -C -D <lib> */ -#define SYMEXPORT __attribute__((visibility("default"))) -#define SYMHIDDEN __attribute__((visibility("internal"))) - /** * @addtogroup alpm_list List Functions * @brief Functions to manipulate alpm_list_t lists. -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

6 9