- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add Doxygen documentation for add.c of libalpm
by Richard Pougnet 18 Aug '13

18 Aug '13

Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- lib/libalpm/add.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 45c57b0..73112fc 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -47,7 +47,16 @@ #include "remove.h" #include "handle.h" -/** Add a package to the transaction. */ +/** Adds a package to transaction add list + * Finds the target package and compares + * to the local version (if it exists). + * If version is newer then cache, or downgrade + * is desired, the package is then added to the list + * and log file is updated. + * @param handle the context handle + * @param pkg the package to be added + * @return 0 on success, 1 on error + */ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) { const char *pkgname, *pkgver; @@ -104,6 +113,18 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) return 0; } +/** Extracts a package. + * Loads the package archive, reads it + * and then extracts. + * If non critical error occured, logs and + * continues. Else, extract fails. + * @param handle the context handle + * @param archive the package archive + * @param entry the entry to be extracted + * @param filename the filename of the archive + * @param origname the name of the package + * @return 0 on success, 1 on error + */ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, const char *filename, const char *origname) { @@ -129,6 +150,12 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, } return 0; } +/** Attempts to rename an entry + * @param handle the context handler + * @param src the original name + * @param dest the final name + * @return 0 on success, 1 on error +*/ static int try_rename(alpm_handle_t *handle, const char *src, const char *dest) { @@ -141,7 +168,14 @@ static int try_rename(alpm_handle_t *handle, const char *src, const char *dest) } return 0; } - +/** Extracts a single file + * @param handle the context handler + * @param archive the package archive + * @param entry the archive entry + * @param newpkg the new package + * @param oldpkg the old package + * @return 0 on success, 1 on error +*/ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, alpm_pkg_t *newpkg, alpm_pkg_t *oldpkg) { @@ -450,7 +484,15 @@ needbackup_cleanup: free(entryname_orig); return errors; } - +/** Commits a package to the database + * Creates a database entry for a newly installed + * package. + * @param handle the context handler + * @param newpkg the package to be entered + * @param pkg_current the current package number + * @param pkg_count total number of packages to be committed + * @return 0 on success, -1 on error +*/ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { @@ -667,6 +709,10 @@ cleanup: return ret; } +/** Upgrades a package + * @param handle the context handler + * @return 0 on success, -1 on error +*/ int _alpm_upgrade_packages(alpm_handle_t *handle) { size_t pkg_count, pkg_current; -- 1.8.3.4

2 1

[pacman-dev] [PATCH] Store fgetc output as an int.
by Allan McRae 12 Aug '13

12 Aug '13

Bug exposed on ARM when char is unsigned resulting in the comparison to EOF always failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 5ce8747..24fd57f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -830,13 +830,15 @@ int main(int argc, char *argv[]) int target_found = 0; size_t current_size = PATH_MAX; char *vdata, *line = malloc(current_size); + int c; /* remove the '-' from the list */ pm_targets = alpm_list_remove_str(pm_targets, "-", &vdata); free(vdata); i = 0; - while((line[i] = (char)fgetc(stdin)) != EOF) { + while((c = fgetc(stdin)) != EOF) { + line[i] = (char)c; if(isspace((unsigned char)line[i])) { /* avoid adding zero length arg when multiple spaces separate args */ if(i > 0) { -- 1.8.3.4

1 0

[pacman-dev] Conflict when replacing a folder with subfolders by a file in a package update
by Timothée Ravier 09 Aug '13

09 Aug '13

Hi, Pacman exits with a conflict error if the package updated is replacing a folder with subfolders inside by a single file with the same name. This may be a bug as I don't know any cases where this cloud make sense. But I may be wrong of course. I'll let you decide. Testing was done on fully updated Arch Linux system with the following repositories enabled: kf5, kde-unstable, testing, core, extra, community-testing, community, multilib-testing, multilib. Example PKGBUILDs to reproduce the issue: $ cat PKGBUILD.1 pkgname=testpkg pkgver=1 pkgrel=1 pkgdesc="Test package" arch=('i686' 'x86_64') license=('GPL') package() { cd "${pkgdir}" mkdir -p usr/test/test } $ cat PKGBUILD.2 pkgname=testpkg pkgver=1 pkgrel=2 pkgdesc="Test package" arch=('i686' 'x86_64') license=('GPL') package() { cd "${pkgdir}" mkdir usr touch usr/test } Pacman output: $ sudo pacman -U testpkg-1-2-x86_64.pkg.tar.xz loading packages... resolving dependencies... looking for inter-conflicts... Packages (1): Name Old Version New Version Net Change testpkg 1-1 1-2 0.00 MiB Total Installed Size: 0.00 MiB Net Upgrade Size: 0.00 MiB :: Proceed with installation? [Y/n] (1/1) checking keys in keyring [--------------------------------------] 100% (1/1) checking package integrity [--------------------------------------] 100% (1/1) loading package files [--------------------------------------] 100% (1/1) checking for file conflicts [--------------------------------------] 100% error: failed to commit transaction (conflicting files) testpkg: /usr/test exists in filesystem Errors occurred, no packages were upgraded. Cheers, Tim

3 3

[pacman-dev] [PATCH 0/5] Version the local database
by Allan McRae 08 Aug '13

08 Aug '13

With removing directory symlink support, we need to make an adjustment to the users local database to adjust any path that relied in that "feature". As this is not a readily detectable change, as was the case in our last local database adjustment, we need to add something to track the local database version. The file ".alpm_db_version" is added to the local database root. This file is automatically created whenever the local database directory is absent or empty. This store the current database version as an integer. I have chosen to use the (next) libalpm soname version so it is easy for us to track what versions are needed. Allan McRae (5): Create local database directory if it is missing Add version file when creating local database directory Add version file to empty local database Check the version of the local database during validation Extend database upgrade script to handle alpm db version 9 lib/libalpm/be_local.c | 118 +++++++++++++++++++++++++++------------- scripts/pacman-db-upgrade.sh.in | 46 ++++++++++++---- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 + 4 files changed, 121 insertions(+), 48 deletions(-) -- 1.8.3.3

2 9

[pacman-dev] [PATCH] doc/repo-add: Add note on when signatures are added to the db
by Olivier Brunel 07 Aug '13

07 Aug '13

Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- It's probably obvious once you know it, but I wasn't sure of how that worked, and couldn't find mention of it anywhere. doc/repo-add.8.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 80f5865..eb54e71 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -25,6 +25,10 @@ They also handle package deltas produced by linkman:pkgdelta[8]. delta file. Multiple packages and/or deltas to add can be specified on the command line. +If a matching ``.sig'' file is found alongside a package file, the signature +will automatically be embedded into the database, thus removing the need for the +``.sig'' file. + 'repo-remove' will update a package database by removing the package name or delta specified on the command line. Multiple packages and/or delta to remove can be specified on the command line. -- 1.8.3.4

2 2

[pacman-dev] [PATCH 0/9] extract ini parser from parseconfig
by Andrew Gregory 07 Aug '13

07 Aug '13

This creates a generic ini parser than can be reused for hooks or other configuration files. I took a very different approach from the previous patchset by utilizing a callback that processes the options as the file is parsed. This should have a much lower memory footprint and is closer to how we were already parsing config files. Parsing differences: * Include directives can be outside a section. They can include their own sections so it made little sense to require that they be in one already. * Errors in included files are now fatal. Andrew Gregory (9): conf.c: add parse_options to section_t conf.c: move repo parsing out of _parseconfig conf.c: move directive parsing out of _parseconfig conf.c: move section handling out of _parseconfig conf.c: pass _parse_directive as a callback conf.c: extract ini parsing code to separate files ini.c: move recursion limit to a macro ini.c: reuse line buffer ini.c: make errors in includes fatal src/pacman/Makefile.am | 1 + src/pacman/conf.c | 257 ++++++++++++++----------------------------------- src/pacman/ini.c | 217 +++++++++++++++++++++++++++++++++++++++++ src/pacman/ini.h | 30 ++++++ 4 files changed, 319 insertions(+), 186 deletions(-) create mode 100644 src/pacman/ini.c create mode 100644 src/pacman/ini.h -- 1.8.3.3

3 18

[pacman-dev] [PATCH] makepkg: allow make-style environment var overrides
by Dave Reisner 05 Aug '13

05 Aug '13

This allows for VAR=value and VAR+=value variable declarations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Similar to the RFC I sent but with the addition of support for appending, not just overriding (as make allows as well). doc/makepkg.8.txt | 2 +- scripts/makepkg.sh.in | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 899858e..512f8ed 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -11,7 +11,7 @@ makepkg - package build utility Synopsis -------- -'makepkg' [options] +'makepkg' [options] [ENVVAR=value] [ENVVAR+=value] ... Description diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a2d0d7d..59013f6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2624,6 +2624,16 @@ while true; do shift done +# attempt to consume any extra argv as environment variables. this supports +# overriding (e.g. CC=clang) as well as overriding (e.g. CFLAGS+=' -g'). +extra_environment=() +while [[ $1 ]]; do + if [[ $1 = ?(_[[:alpha:]])+([[:alnum:]_])?(+)=* ]]; then + extra_environment+=("$1") + fi + shift +done + # setup signal traps trap 'clean_up' 0 for signal in TERM HUP QUIT; do @@ -2706,6 +2716,11 @@ if [[ ! -w $BUILDDIR ]]; then exit 1 fi +# override settings from extra variables on commandline, if any +if (( ${#extra_environment[*]} )); then + export "${extra_environment[@]}" +fi + PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then -- 1.8.3.4

4 6

[pacman-dev] [PATCH] check.c: break backup file search loop after match
by Andrew Gregory 05 Aug '13

05 Aug '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index 6c8889f..f9166b0 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -327,11 +327,11 @@ int check_pkg_full(alpm_pkg_t *pkg) for(lp = alpm_pkg_get_backup(pkg); lp; lp = lp->next) { alpm_backup_t *bl = lp->data; if(strcmp(path, bl->name) == 0) { backup = 1; - continue; + break; } } if(type != AE_IFDIR) { /* file or symbolic link */ -- 1.8.3.4

2 1

[pacman-dev] [PATCH v2 1/9] pacdiff: Search and give warnings for older pacsave.[0-9]* files
by Jonathan Frazier 03 Aug '13

03 Aug '13

Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> --- contrib/pacdiff.sh.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 47779d6..5ce6140 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -25,6 +25,7 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 USE_COLOR='y' +declare -a oldsaves m4_include(../scripts/library/output_format.sh) @@ -47,9 +48,9 @@ version() { cmd() { if [ $locate -eq 1 ]; then - locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave + locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]*' else - find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave $ -print0 + find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -o -name '*.pacsave.[0-9]*' $ -print0 fi } @@ -71,6 +72,12 @@ while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" file_type="pac${pacfile##*.pac}" + # add matches for pacsave.N to oldsaves array, do not prompt + if [[ $file_type = pacsave.+([0-9]) ]]; then + oldsaves+=("$pacfile") + continue + fi + msg "%s file found for %s" "$file_type" "$file" if [ ! -f "$file" ]; then warning "$file does not exist" @@ -97,6 +104,8 @@ while IFS= read -u 3 -r -d '' pacfile; do fi done 3< <(cmd) +(( ${#oldsaves[@]} )) && warning "Ignoring %s" "${oldsaves[@]}" + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.3.2

4 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-85-g48861f5
by allan＠archlinux.org 30 Jul '13

30 Jul '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 48861f509a817649f6cbda63e5ed253bdebc4f56 (commit) via d7bd40045c5a8c1240800bddf61ddac3fa4bd3d2 (commit) via e81faa9d6d2ac910720a9a87a9f469b80cf106e5 (commit) via 640324f1d4a63709822f61a9647e06d95e6c0c21 (commit) via 8e533b0363551febeab7521b21d16ff46a1722aa (commit) via 4ad6939980a9c6e6fc12c78d9d4b0d2a69dcc01b (commit) via 0f22bef8c3441fce4cc47618f644e4f818117014 (commit) via 2d9dad5e14f35657ce4f6e1f59867a0638eca3aa (commit) via a79661225a5d017864aefbacda50322ae1952df5 (commit) via 15eea825e65e4ed1e7e186cb1f3535ed04b71373 (commit) via b1b9ca01f06b74924945ea1ac75d36d1ea89c423 (commit) via 05e954d2cd71bf1031a79bd77610c6cb1da9ef54 (commit) via bcde02709120fa8d16d63d5fc797876f5f2fc465 (commit) via c4d8da47271972a58357bef95efe0b9143714a48 (commit) from 6e3ea82f9bd88fc12efbb6da24e2b52ca3cf9819 (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 48861f509a817649f6cbda63e5ed253bdebc4f56 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:48:31 2013 +1000 Report missing directory if we can not initialise alpm library When pacman failed to initialise the alpm library due to the database directory being missing (either via the root not existing or the database directory itself not existing), it just printed the non-informative message "could not find or read directory". Add the directory information the the error output. E.g.: error: failed to initialize alpm library (could not find or read directory: /this/does/not/exist/var/lib/pacman/) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d7bd40045c5a8c1240800bddf61ddac3fa4bd3d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:38:17 2013 +1000 Remove setlocale usage from the backend Using setlocale in the backend is bound to lead to frontend issues and we have have been using epoch in our databases since April 2007 (commit 47622eef). Remove support for old style times. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e81faa9d6d2ac910720a9a87a9f469b80cf106e5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 16:10:25 2013 +1000 Warn when directory ownership differs between filesystem and package We currently only warn if a directory's permissions differ, but using -Qkk on my system shows that directory permissions tend to change in packages reasonably frequently without notice. Provide a warning in such cases so that it can be altered. Example output: (1/1) reinstalling nginx warning: directory ownership differs on /var/lib/nginx/proxy/ filesystem: 33:0 package: 0:0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 640324f1d4a63709822f61a9647e06d95e6c0c21 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 21 15:38:24 2013 +1000 Only note backup file changes with -Qkk Backup files are expected to be changed and should not be flagged by -Qkk. Note changed back-up files in -Qkk but do not count them as altered. Do not report backup files in -Qqkk. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8e533b0363551febeab7521b21d16ff46a1722aa Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Jul 22 03:09:58 2013 +0200 Fix whitespace in makepkg.sh.in and makepkg-template.pl.in Replace spaces with tabs in one instance. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ad6939980a9c6e6fc12c78d9d4b0d2a69dcc01b Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Jul 22 03:09:57 2013 +0200 Fix whitespace in pacsort.c and pactree.c Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f22bef8c3441fce4cc47618f644e4f818117014 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 18:05:58 2013 -0400 pacdiff: provide an --output option to show any .pac* files This is an option to just echo's the pacnews/pacsaves instead of merging or removing them. This can be used to check the config status such as in a cron job without modifying the system. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d9dad5e14f35657ce4f6e1f59867a0638eca3aa Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 17:50:44 2013 -0400 pacdiff: make pacmandb search the default type. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a79661225a5d017864aefbacda50322ae1952df5 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 18 17:12:32 2013 -0400 pacdiff: improve speed, accuracy finding active configs using pacmandb This is a new search type, using -p or --pacmandb options. It reads config file locations directly from the local pacman db. It will find active configs anywhere they are defined in installed packages. It is not dependant on outside configs such as updatedb.conf or scanning a large set of directories for find. This will find more pacnews than find when searching with the current default of /etc, and it is faster than both find and updatedb when searching the entire fs. When run directly after an update, the local db is more likely to be cached than all files in /etc or / as other methods read. This will increase performance further post upgrade. After a package is removed and a pacsave is created, this method will not find these pacsaves until the base config is added to the local db again. These files have no influence in a working system and only take up a few blocks of disk space. Active configs need to be dealt with immediately to keep a system working. pacsaves related to removed configs can remain for weeks or months without problems. I would recommend occasionally running other methods such as --locate to remove them. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15eea825e65e4ed1e7e186cb1f3535ed04b71373 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Tue Jul 16 12:38:15 2013 -0400 pacdiff: rework search type handling, add --find option Change cmd tests to if (( USE_FIND ))... as it is cleaner. All search cmds have an option and a variable initialized to zero. The active option should be set to 1. Add a switch to exclude multiple search options. set the default when all are equal to zero. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1b9ca01f06b74924945ea1ac75d36d1ea89c423 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 13:02:33 2013 -0400 pacdiff: add --nocolor option for the terminally challenged. Allow colors to be disabled for use on broken/serial terminals. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05e954d2cd71bf1031a79bd77610c6cb1da9ef54 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 12:56:03 2013 -0400 pacdiff: allow multiple separated options loop over arguments, this will allow adding options such as --nocolor Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcde02709120fa8d16d63d5fc797876f5f2fc465 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Mon Jul 15 11:00:30 2013 -0400 pacdiff: clean up and reword --help Clean up and reword --help get rid of all the echos to make it easier to read in source. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c4d8da47271972a58357bef95efe0b9143714a48 Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Sun Jul 7 09:45:02 2013 -0400 pacdiff: Search and give warnings for older pacsave.[0-9]* files Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff.sh.in | 125 ++++++++++++++++++++++++++++++++++------- lib/libalpm/add.c | 16 +++++- lib/libalpm/util.c | 15 ----- scripts/makepkg-template.pl.in | 2 +- scripts/makepkg.sh.in | 8 +-- src/pacman/check.c | 53 +++++++++++++---- src/pacman/conf.c | 4 +- src/util/pacsort.c | 20 +++---- src/util/pactree.c | 20 +++---- test/pacman/tests/query002.py | 5 +- test/pacman/tests/sync1100.py | 3 - 11 files changed, 189 insertions(+), 82 deletions(-) hooks/post-receive -- The official pacman repository

1 0