- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: remove distcc/makeflags option interaction
by Dan McGee 23 Jun '11

23 Jun '11

Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..cd94ac9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -822,9 +822,6 @@ run_build() { if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS - elif [[ $(check_option distcc) = "n" ]]; then - # if it is not wanted, clear the makeflags too - MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) -- 1.7.5.4

2 1

[pacman-dev] Discussion about deprecating/removing the changelog feature from pacman.
by Thomas Dziedzic 23 Jun '11

23 Jun '11

I would like to bring up a point which has been annoying me for a while and I would like to get it out there. I will argue that the changelog feature is unnecessary in pacman/PKGBUILDs. 1.) It's a feature rarely used by anyone, e.g. there are changelogs which exist which haven't been updated in years which I encounter and remove right away. 2.)Svn log usually serves the same purpose, and I can not think of any benefits changelogs provide over svn log. 3.)I can not think of one package I have encountered that included a useful changelog. Some ways to go about removing it are: declare deprecated -> remove after some time or just remove changelog support right away The last option might be viable given its small audience.

8 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-292-g886a31e
by dan＠archlinux.org 22 Jun '11

22 Jun '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 886a31ef205923fd5b29012ee75932a2e2dec4bd (commit) from 85902d98e831d79dfef1bd3cc7099c6dba806e8a (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 886a31ef205923fd5b29012ee75932a2e2dec4bd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 11:51:58 2011 -0500 makepkg: fix 'check_sofware' typo Allan broke it! Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-291-g85902d9
by dan＠archlinux.org 22 Jun '11

22 Jun '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 85902d98e831d79dfef1bd3cc7099c6dba806e8a (commit) via 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 (commit) via 74689562363b3dec2a97ce095295a5222562061d (commit) via e97541c2083205a81f46225c367a9f470c702dd1 (commit) via 41f9fa9bed15b9e01b78edcea83b9c81679be3bf (commit) via 3497eb4e2c1bf3869176f944ba97c289bebf2e30 (commit) via 508b360c24ddfdb79f66cc14b197988a829b0ecd (commit) via b803a33a8fc2ef86ba2d986c36f31524532d454b (commit) from b8990993271b34d309ada49197090895b0fbdfb6 (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 85902d98e831d79dfef1bd3cc7099c6dba806e8a Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 16:38:57 2011 -0400 repo-add: style cleanup Unify function braces to be top right opening, bottom left closing. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d4bf3b3fdabb721ab4be23e6ca26e8fa5bb9806 Author: Kerrick Staley <mail(a)kerrickstaley.com> Date: Wed Jun 22 00:32:57 2011 -0500 Fixed outdated documentation in test/pacman/README test/pacman/README mentioned the -A flag, which no longer exists. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74689562363b3dec2a97ce095295a5222562061d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 13:02:07 2011 +1000 makepkg: add software check function Add a function that checks for the software needed by makepkg to process a PKGBUILD with the requested options. This allows makepkg to bail early in the packaging process. Many other checks can be added to this function... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e97541c2083205a81f46225c367a9f470c702dd1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 21 12:27:21 2011 +1000 Remove old TODO lists These had not been touched since 2007 and had lost most of their relevance. The bug tracker is a better place for the filing of ideas. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41f9fa9bed15b9e01b78edcea83b9c81679be3bf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 16 19:57:31 2011 +1000 makepkg: move comment into correct place Oops... Introduced by commit d21f6ca4. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3497eb4e2c1bf3869176f944ba97c289bebf2e30 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 21:59:06 2011 +1000 makepkg: adjust libprovides/depends messages Contractions are less clear for non-native speakers so should be avoided (and cause syntax highlighting issues). Also, the 'provides' and 'depends' strings are not to be translated. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 508b360c24ddfdb79f66cc14b197988a829b0ecd Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 14:32:42 2011 +1000 makepkg: allow specifying alternative build directory Add a BUILDDIR variable (which can be overridden in the environment) to specify an alternative location for building the package. This is useful for people who want to build on a different filesystem for improved performance (e.g. tmpfs). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b803a33a8fc2ef86ba2d986c36f31524532d454b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 14 22:01:05 2011 +1000 makepkg: Add UPX compression support This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TODO.aaron | 57 -------------------------- TODO.dan | 95 -------------------------------------------- doc/PKGBUILD.5.txt | 3 + doc/makepkg.8.txt | 3 + doc/makepkg.conf.5.txt | 14 ++++++- etc/makepkg.conf.in | 8 +++- scripts/makepkg.sh.in | 103 ++++++++++++++++++++++++++++++++++++------------ scripts/repo-add.sh.in | 24 ++++------- test/pacman/README | 6 +- 9 files changed, 114 insertions(+), 199 deletions(-) delete mode 100644 TODO.aaron delete mode 100644 TODO.dan hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Unify modelines in Asciidoc files
by Dan McGee 22 Jun '11

22 Jun '11

This gets us close to using the same modeline in all files we run through Asciidoc, as well as adding the spell and spelllang declarations, just as we had in NEWS already. The choice of 'en_us' is mainly for consistency and because the body of work already uses these spellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- HACKING | 2 +- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 10 +++++----- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman-key.8.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/pkgdelta.8.txt | 2 +- doc/repo-add.8.txt | 2 +- doc/submitting-patches.txt | 6 +++--- doc/translation-help.txt | 34 +++++++++++++++++----------------- doc/vercmp.8.txt | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/HACKING b/HACKING index 2df7ecc..6692f7e 100644 --- a/HACKING +++ b/HACKING @@ -147,5 +147,5 @@ For example, to run valgrind: valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 4d76121..8dcf491 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 2ffb009..a132542 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/index.txt b/doc/index.txt index 4cc8313..5fd3f3b 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -107,9 +107,9 @@ link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest available source tarball, unpack it in a directory, and run the three magic commands: - $ ./configure - $ make - # make install + $ ./configure + $ make + # make install You may wish to read the options presented by `./configure --help` in order to set appropriate paths and build options that are correct for your system. @@ -132,7 +132,7 @@ these trees). The current development tree can be fetched with the following command: - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman which will fetch the full development history into a directory named pacman. You can browse the source as well using @@ -206,5 +206,5 @@ pacman is Copyright (C) 2006-2011 Pacman Development Team version 2 or later. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index b7a892c..e2ea32c 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e59c5ff 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index aa0174c..b93e4cd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// makepkg.conf(5) =============== diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 892f14d..24c9470 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman-key(8) ============= diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 531c992..8a6565f 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index bdf0bc8..308f471 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pacman.conf(5) ============== diff --git a/doc/pkgdelta.8.txt b/doc/pkgdelta.8.txt index 2d99a87..3804c5d 100644 --- a/doc/pkgdelta.8.txt +++ b/doc/pkgdelta.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// pkgdelta(8) ========= diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 0196882..919b906 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// repo-add(8) ========== diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index e6853c5..3428768 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -20,7 +20,7 @@ started with GIT if you have not worked with it before. The pacman code can be fetched using the following command: - git clone git://projects.archlinux.org/pacman.git + git clone git://projects.archlinux.org/pacman.git Creating your patch @@ -32,7 +32,7 @@ Creating your patch The -s allows you to credit yourself by adding a "Signed Off By" line to indicate who has "signed" the patch - who has approved it. - Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> + Signed-off-by: Aaron Griffin <aaron(a)archlinux.org> Please use your real name and email address. Feel free to "scramble" the address if you're afraid of spam. @@ -94,5 +94,5 @@ aren't their own. -- ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/translation-help.txt b/doc/translation-help.txt index d95b513..ef86dbf 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -40,15 +40,15 @@ not worried about any local translations being overwritten. The .tx/ directory is checked into the git repository so is preconfigured with the two project resources (See `tx status` output for a quick overview). - tx pull -f - poedit po/<mylang>.po - poedit lib/libalpm/po/<mylang>.po - tx push -t -l <mylang> + tx pull -f + poedit po/<mylang>.po + poedit lib/libalpm/po/<mylang>.po + tx push -t -l <mylang> Or to just push one of the two available resources: - tx push -r archlinux-pacman.pacman-pot -t -l fi - tx push -r archlinux-pacman.libalpm-pot -t -l fi + tx push -r archlinux-pacman.pacman-pot -t -l fi + tx push -r archlinux-pacman.libalpm-pot -t -l fi See the <<Notes,Notes>> section for additional hints on translating. @@ -79,7 +79,7 @@ Incremental Updates If you have more advanced needs you will have to get a copy of the pacman repository. - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://projects.archlinux.org/pacman.git pacman Next, you will need to run `./autogen.sh` and `./configure` in the base directory to generate the correct Makefiles. At this point, all necessary @@ -91,11 +91,11 @@ We need to first update the main message catalog file. Navigate into either the work on first, and execute the following command. If you are working in the `po/` tree, replace 'libalpm.pot' with 'pacman.pot': - make libalpm.pot-update + make libalpm.pot-update Next, update your specific language's translation file: - make <po file>-update + make <po file>-update At this point, you can do the translation. To submit your changes, either email the new `.po` file to the mailing-list with *[translation]* in the subject, or @@ -104,7 +104,7 @@ submit a GIT-formatted patch (please do not include any `.pot` file changes). As a shortcut, all translation files (including `.pot` files) can be updated with the following command: - make update-po + make update-po Adding a New Language ~~~~~~~~~~~~~~~~~~~~~ @@ -133,16 +133,16 @@ msgid and msgstr 'variables' can be on as many lines as necessary. Line breaks are ignored- if you need a literal line break, use an `\n` in your string. The following two translations are equivalent: - msgstr "This is a test translation" + msgstr "This is a test translation" - msgstr "" - "This is a test translation" + msgstr "" + "This is a test translation" If you want to test the translation (for example, the frontend one): - rm *.gmo stamp-po - make - cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo + rm *.gmo stamp-po + make + cp <lang code>.gmo /usr/share/locale/<lang code>/LC_MESSAGES/pacman.mo Translating Manpages @@ -160,5 +160,5 @@ check there first before undergoing a translation effort to ensure you are not duplicating efforts. ///// -vim: set ts=2 sw=2 syntax=asciidoc et: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index f2fc530..a3bc561 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// vercmp(8) ========= -- 1.7.5.4

1 0

[pacman-dev] [PATCH 0/3] repo-add desc/depends creation cleanup
by Dave Reisner 22 Jun '11

22 Jun '11

This is basically what I referred to in my last patch about refactoring desc/depends writing. I snuck in an extra winner (the first) to get rid of the insane IFS tweaking and iteration of the .PKGINFO file with a for loop. Dan, I'm not sure if I can break this up any further, but I'm happy to refactor if it would make you more comfortable. I know it's an insanely important code path so I encourage you (and anyone else reading) to put on your nerd glasses and nitpick this. Dave Reisner (3): repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields scripts/repo-add.sh.in | 105 +++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 54 deletions(-) -- 1.7.5.4

3 9

[pacman-dev] [PATCH] [RFC] repo-add: don't create links if archive extension is invalid
by Dan McGee 22 Jun '11

22 Jun '11

Not sure what to do here, if we should be proceeding at all. The current situation: dmcgee@galway ~/projects/pacman (master) $ ./scripts/repo-add /tmp/invalid.xxx /var/cache/pacman/pkg/apr-1.4.5-1-x86_64.pkg.tar.xz ==> Adding package '/var/cache/pacman/pkg/apr-1.4.5-1-x86_64.pkg.tar.xz' -> Computing checksums... -> Creating 'desc' db entry... -> Creating 'depends' db entry... ==> Creating updated database file '/tmp/invalid.xxx' ==> WARNING: '/tmp/invalid.xxx' does not have a valid archive extension. dmcgee@galway ~/projects/pacman (master) $ ll /tmp/invalid.xxx lrwxrwxrwx 1 dmcgee users 11 Jun 20 11:08 /tmp/invalid.xxx -> invalid.xxx So we get a symlink to ourself, and overwrite the originally generated repo database. This patch prevents this behavior, and writes out a non-compressed database to invalid.xxx and generates no links. Thoughts? Pacman has a requirement that the db file end in '.db', and the only other extension out there in the wild is '.files' as far as I know. Should we have strict enforcement of one of these two types in repo-add? Doing this could also make the --files flag a bit less necessary as one could auto-detect the correct setting based on the DB extension. --- scripts/repo-add.sh.in | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0ea8e5b..b29ff92 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -582,8 +582,10 @@ if (( success )); then *.tar.bz2) TAR_OPT="j" ;; *.tar.xz) TAR_OPT="J" ;; *.tar) TAR_OPT="" ;; - *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ - "$REPO_DB_FILE" ;; + *) + warning "$(gettext "'%s' does not have a valid archive extension.")" \ + "$REPO_DB_FILE" + TAR_OPT="" ;; esac filename=${REPO_DB_FILE##*/} @@ -605,14 +607,16 @@ if (( success )); then [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" - target=${REPO_DB_FILE##*/} - ln -sf "$target" "$dblink" 2>/dev/null || \ - ln -f "$target" "$dblink" 2>/dev/null || \ - cp "$REPO_DB_FILE" "$dblink" - if [[ -f "$target.sig" ]]; then - ln -sf "$target.sig" "$dblink.sig" 2>/dev/null || \ - ln -f "$target.sig" "$dblink.sig" 2>/dev/null || \ - cp "$REPO_DB_FILE.sig" "$dblink.sig" + if [[ $dblink != $REPO_DB_FILE ]]; then + target=${REPO_DB_FILE##*/} + ln -sf "$target" "$dblink" 2>/dev/null || \ + ln -f "$target" "$dblink" 2>/dev/null || \ + cp "$REPO_DB_FILE" "$dblink" + if [[ -f "$target.sig" ]]; then + ln -sf "$target.sig" "$dblink.sig" 2>/dev/null || \ + ln -f "$target.sig" "$dblink.sig" 2>/dev/null || \ + cp "$REPO_DB_FILE.sig" "$dblink.sig" + fi fi else msg "$(gettext "No packages modified, nothing to do.")" -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Fixed outdated documentation in test/pacman/README
by Kerrick Staley 22 Jun '11

22 Jun '11

test/pacman/README mentioned the -A flag, which no longer exists. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> --- test/pacman/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pacman/README b/test/pacman/README index 0bd0213..a3c36fc 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -22,7 +22,7 @@ The following directory structure is used: - var/cache/pkg: sync packages cache - var/log/pactest.log: log file - var/pub: location for pseudo sync repositories - - tmp: hold all local package archives (to be used with pacman -A or -U) + - tmp: hold all local package archives (to be used with pacman -U) Note: the logfile is used to capture all pacman outputs. @@ -34,7 +34,7 @@ Test case example: "usr/man/man1/dummy.1"] self.addpkg(p) - self.args = "-A dummy-1.0-1.pkg.tar.gz" + self.args = "-U dummy-1.0-1.pkg.tar.gz" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=dummy") @@ -42,7 +42,7 @@ Test case example: self.addrule("FILE_EXIST=%s" % f) Basically, the above test case will try to install a package (dummy-1.0-3), -including two files, from a local archive, by calling "pacman -A" +including two files, from a local archive, by calling "pacman -U" Upon completion, it checks that: - pacman returned no error code, - a "dummy" entry exists in the "local" database -- 1.7.5.2

1 0

[pacman-dev] [PATCH] repo-add.8.txt: document valid DB file extensions
by Dave Reisner 21 Jun '11

21 Jun '11

Signed-off-by: Dave Reisner <d(a)falconindy.com> --- This isn't documented anywhere except in the code, and every few months when I end up having to test something that requires my own repo, it takes me 10 minutes to figure out wtf a valid file extension is. d doc/repo-add.8.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 0196882..c4f42a2 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -29,6 +29,10 @@ command line. delta specified on the command line. Multiple packages and/or delta to remove can be specified on the command line. +A package database is a path a compressed tar file with one of the extensions: +``.tar'', ``.tar.gz'', ``.tar.bz2'', or ``.tar.xz''. The file does not need to +exist, but all parent directories must exist. + Common Options -------------- -- 1.7.5.4

3 4

[pacman-dev] [PATCH] makepkg: reword purge message
by Allan McRae 21 Jun '11

21 Jun '11

Clarfiy that it is unwanted files are being removed rather than "other" files (whatever they are...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 0639fbd..01206d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -856,7 +856,7 @@ tidy_install() { fi if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[*]} ]]; then - msg2 "$(gettext "Purging other files...")" + msg2 "$(gettext "Purging unwanted files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do if [[ ${pt} = ${pt//\/} ]]; then -- 1.7.5.4

2 12

[pacman-dev] [PATCH] repo-add: reuse write_list_entry for desc file
by Dave Reisner 20 Jun '11

20 Jun '11

Repurpose the write_list_entry function for everything we write to the depends and desc files by appending our own extra newline after each single line data point. This also refactors write_list_entry into a single printf statement. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- More repo-add madness. Reusable code, ftw. dave scripts/repo-add.sh.in | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 14506dc..a23f89e 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -88,8 +88,7 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # arg3 - File to write to write_list_entry() { if [[ -n $2 ]]; then - echo "%$1%" >>$3 - echo -e $2 >>$3 + printf "%%%s%%\n$2\n" "$1" >>"$3" fi } @@ -301,27 +300,27 @@ db_write_entry() # create desc entry msg2 "$(gettext "Creating '%s' db entry...")" 'desc' - echo -e "%FILENAME%\n${1##*/}\n" >>desc - echo -e "%NAME%\n$pkgname\n" >>desc - [[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc - echo -e "%VERSION%\n$pkgver\n" >>desc - [[ -n $pkgdesc ]] && echo -e "%DESC%\n$pkgdesc\n" >>desc + write_list_entry "FILENAME" "${1##*/}\n" "desc" + write_list_entry "NAME" "$pkgname\n" "desc" + [[ -n $pkgbase ]] && write_list_entry "BASE" "$pkgbase\n" "desc" + write_list_entry "VERSION" "$pkgver\n" "desc" + [[ -n $pkgdesc ]] && write_list_entry "DESC" "$pkgdesc\n" "desc" write_list_entry "GROUPS" "$_groups" "desc" - [[ -n $csize ]] && echo -e "%CSIZE%\n$csize\n" >>desc - [[ -n $size ]] && echo -e "%ISIZE%\n$size\n" >>desc + [[ -n $csize ]] && write_list_entry "CSIZE" "$csize\n" "desc" + [[ -n $size ]] && write_list_entry "ISIZE" "$size\n" "desc" # add checksums - echo -e "%MD5SUM%\n$md5sum\n" >>desc - echo -e "%SHA256SUM%\n$sha256sum\n" >>desc + write_list_entry "MD5SUM" "$md5sum\n" "desc" + write_list_entry "SHA256SUM" "$sha256sum\n" "desc" # add PGP sig - [[ -n $pgpsig ]] && echo -e "%PGPSIG%\n$pgpsig\n" >>desc + [[ -n $pgpsig ]] && write_list_entry "PGPSIG" "$pgpsig\n" "desc" - [[ -n $url ]] && echo -e "%URL%\n$url\n" >>desc + [[ -n $url ]] && write_list_entry "URL" "$url\n" "desc" write_list_entry "LICENSE" "$_licenses" "desc" - [[ -n $arch ]] && echo -e "%ARCH%\n$arch\n" >>desc - [[ -n $builddate ]] && echo -e "%BUILDDATE%\n$builddate\n" >>desc - [[ -n $packager ]] && echo -e "%PACKAGER%\n$packager\n" >>desc + [[ -n $arch ]] && write_list_entry "ARCH" "$arch\n" "desc" + [[ -n $builddate ]] && write_list_entry "BUILDDATE" "$builddate\n" "desc" + [[ -n $packager ]] && write_list_entry "PACKAGER" "$packager\n" "desc" write_list_entry "REPLACES" "$_replaces" "desc" # create depends entry -- 1.7.5.4

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-283-gb899099
by dan＠archlinux.org 20 Jun '11

20 Jun '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 b8990993271b34d309ada49197090895b0fbdfb6 (commit) via ee638415e305a390cbf3fa68fb2a1fb5523f18e9 (commit) via ab53aa3e3c6370d21ab763210830cd31a5a024a2 (commit) via 3847446603036e3a873c2d0bc0cdd6c1aa19fc2e (commit) via 81e6071e0f0c6ea1f4bb654e3e98493c4650e858 (commit) from 34876e4fe9707de961318da28dba604dffff6d49 (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 b8990993271b34d309ada49197090895b0fbdfb6 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 11:05:08 2011 -0400 repo-add: show better error when path to repo does not exist Previously, the error message when trying to add to a repo where a parent directory didn't exist was: ==> ERROR: Failed to acquire lockfile: /path/to/noexist/repo.tar.gz.lck This sucks. Make an explicit check to ensure that the path to the repo really does exist, and throw a meaningful error message when it can't be found. Dan: reuse an existing (translated) error message. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ee638415e305a390cbf3fa68fb2a1fb5523f18e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 20 11:08:40 2011 -0500 repo-add: allow creating a database with no compression A plain '.tar' ending should be allowed. This corresponds to how we handle this extension in makepkg. Also fix up the other extension checks, which were missing a leading '.' character. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab53aa3e3c6370d21ab763210830cd31a5a024a2 Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 20 10:32:12 2011 -0400 repo-add: use bash equivalents of basename/dirname Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 3847446603036e3a873c2d0bc0cdd6c1aa19fc2e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jun 18 19:21:21 2011 -0400 lib/util: call _alpm_log before setting handle->pm_errno This is an unfortunate chain of events. RET_ERR and RET_ERR_VOID will eventually call CHECK_HANDLE, which resets the handle's pm_errno member. Dan probably had a reason for doing this, so we merely switch the order of operations in the RET_ERR macros to avoid stomping on our pm_errno. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 81e6071e0f0c6ea1f4bb654e3e98493c4650e858 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:50:23 2011 -0500 pactest: add retcode=0 to several tests Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.h | 6 ++++-- scripts/repo-add.sh.in | 27 +++++++++++++++++---------- test/pacman/tests/upgrade020.py | 1 + test/pacman/tests/upgrade021.py | 1 + test/pacman/tests/upgrade022.py | 1 + test/pacman/tests/upgrade023.py | 1 + test/pacman/tests/upgrade024.py | 1 + test/pacman/tests/upgrade025.py | 1 + test/pacman/tests/upgrade026.py | 1 + test/pacman/tests/upgrade042.py | 1 + test/pacman/tests/upgrade043.py | 1 + test/pacman/tests/upgrade045.py | 1 + 12 files changed, 31 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add: allow creating a database with no compression
by Dan McGee 20 Jun '11

20 Jun '11

A plain '.tar' ending should be allowed. This corresponds to how we handle this extension in makepkg. Also fix up the other extension checks, which were missing a leading '.' character. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index f3cc184..0ea8e5b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -578,9 +578,10 @@ if (( success )); then msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" case "$REPO_DB_FILE" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; + *.tar.gz) TAR_OPT="z" ;; + *.tar.bz2) TAR_OPT="j" ;; + *.tar.xz) TAR_OPT="J" ;; + *.tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ "$REPO_DB_FILE" ;; esac @@ -603,7 +604,7 @@ if (( success )); then [[ -f $REPO_DB_FILE.sig ]] && rm -f "$REPO_DB_FILE.sig" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" - dblink="${REPO_DB_FILE%.tar.*}" + dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} ln -sf "$target" "$dblink" 2>/dev/null || \ ln -f "$target" "$dblink" 2>/dev/null || \ -- 1.7.5.4

1 0

[pacman-dev] [PATCH] Convert backup list to new pmbackup_t type
by Dan McGee 20 Jun '11

20 Jun '11

This allows us to separate the name and hash elements in one place and not scatter different parsing code all over the place, including both the frontend and backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- While the API changing season is still ongoing, although this one has pissed me off for a while (WTF are we doing parsing the '\t' in the frontend and backend multiple times?). Recommend starting with the alpm.h and backup.h changes to get a quick overview, then reviewing the rest of the patch. -Dan lib/libalpm/add.c | 67 +++++++++++++++----------------------- lib/libalpm/alpm.h | 6 +++ lib/libalpm/backup.c | 80 +++++++++++++++++++-------------------------- lib/libalpm/backup.h | 8 +++-- lib/libalpm/be_local.c | 12 ++++-- lib/libalpm/be_package.c | 5 ++- lib/libalpm/package.c | 7 +++- lib/libalpm/package.h | 1 + lib/libalpm/remove.c | 22 ++++++------- src/pacman/package.c | 19 ++++------- 10 files changed, 106 insertions(+), 121 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 7b394a5..fd8799b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -138,7 +138,7 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, mode_t entrymode; char filename[PATH_MAX]; /* the actual file we're extracting */ int needbackup = 0, notouch = 0; - char *hash_orig = NULL; + const char *hash_orig = NULL; char *entryname_orig = NULL; int errors = 0; @@ -252,23 +252,26 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, if(alpm_list_find_str(handle->noupgrade, entryname)) { notouch = 1; } else { + pmbackup_t *backup; /* go to the backup array and see if our conflict is there */ /* check newpkg first, so that adding backup files is retroactive */ - if(alpm_list_find_str(alpm_pkg_get_backup(newpkg), entryname) != NULL) { + backup = _alpm_needbackup(entryname, alpm_pkg_get_backup(newpkg)); + if(backup) { needbackup = 1; } /* check oldpkg for a backup entry, store the hash if available */ if(oldpkg) { - hash_orig = _alpm_needbackup(entryname, alpm_pkg_get_backup(oldpkg)); - if(hash_orig) { + backup = _alpm_needbackup(entryname, alpm_pkg_get_backup(oldpkg)); + if(backup) { + hash_orig = backup->hash; needbackup = 1; } } /* if we force hash_orig to be non-NULL retroactive backup works */ if(needbackup && !hash_orig) { - STRDUP(hash_orig, "", RET_ERR(handle, PM_ERR_MEMORY, -1)); + hash_orig = ""; } } } @@ -290,7 +293,6 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, ret = perform_extraction(handle, archive, entry, checkfile, entryname_orig); if(ret == 1) { /* error */ - FREE(hash_orig); FREE(entryname_orig); return 1; } @@ -298,24 +300,17 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, hash_local = alpm_compute_md5sum(filename); hash_pkg = alpm_compute_md5sum(checkfile); - /* append the new md5 hash to it's respective entry - * in newpkg's backup (it will be the new orginal) */ - alpm_list_t *backups; - for(backups = alpm_pkg_get_backup(newpkg); backups; - backups = alpm_list_next(backups)) { - char *oldbackup = alpm_list_getdata(backups); - if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) { + /* update the md5 hash in newpkg's backup (it will be the new orginal) */ + alpm_list_t *i; + for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { + pmbackup_t *backup = i->data; + char *newhash; + if(!backup->name || strcmp(backup->name, entryname_orig) != 0) { continue; } - char *backup = NULL; - /* length is tab char, null byte and MD5 (32 char) */ - size_t backup_len = strlen(oldbackup) + 34; - MALLOC(backup, backup_len, RET_ERR(handle, PM_ERR_MEMORY, -1)); - - sprintf(backup, "%s\t%s", oldbackup, hash_pkg); - backup[backup_len-1] = '\0'; - FREE(oldbackup); - backups->data = backup; + STRDUP(newhash, hash_pkg, RET_ERR(handle, PM_ERR_MEMORY, -1)); + FREE(backup->hash); + backup->hash = newhash; } _alpm_log(handle, PM_LOG_DEBUG, "checking hashes for %s\n", entryname_orig); @@ -409,7 +404,6 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, FREE(hash_local); FREE(hash_pkg); - FREE(hash_orig); } else { int ret; @@ -439,26 +433,17 @@ static int extract_single_file(pmhandle_t *handle, struct archive *archive, } /* calculate an hash if this is in newpkg's backup */ - alpm_list_t *b; - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - char *backup = NULL, *hash = NULL; - char *oldbackup = alpm_list_getdata(b); - /* length is tab char, null byte and MD5 (32 char) */ - size_t backup_len = strlen(oldbackup) + 34; - - if(!oldbackup || strcmp(oldbackup, entryname_orig) != 0) { + alpm_list_t *i; + for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) { + pmbackup_t *backup = i->data; + char *newhash; + if(!backup->name || strcmp(backup->name, entryname_orig) != 0) { continue; } - _alpm_log(handle, PM_LOG_DEBUG, "appending backup entry for %s\n", filename); - - hash = alpm_compute_md5sum(filename); - MALLOC(backup, backup_len, RET_ERR(handle, PM_ERR_MEMORY, -1)); - - sprintf(backup, "%s\t%s", oldbackup, hash); - backup[backup_len-1] = '\0'; - FREE(hash); - FREE(oldbackup); - b->data = backup; + _alpm_log(handle, PM_LOG_DEBUG, "appending backup entry for %s\n", entryname_orig); + newhash = alpm_compute_md5sum(filename); + FREE(backup->hash); + backup->hash = newhash; } } FREE(entryname_orig); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index d1faf7f..715e502 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -160,6 +160,12 @@ typedef struct _pmdelta_t { off_t download_size; } pmdelta_t; +/** Local package or package file backup entry */ +typedef struct _pmbackup_t { + char *name; + char *hash; +} pmbackup_t; + /* * Logging facilities */ diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 6431b28..20fb8a8 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -32,54 +32,33 @@ #include "log.h" #include "util.h" -/* split a backup string "file\thash" into two strings : file and hash */ -static int backup_split(const char *string, char **file, char **hash) +/* split a backup string "file\thash" into the relevant components */ +int _alpm_split_backup(const char *string, pmbackup_t **backup) { - char *str = strdup(string); - char *ptr; + char *str, *ptr; + + STRDUP(str, string, return -1); /* tab delimiter */ ptr = strchr(str, '\t'); if(ptr == NULL) { - if(file) { - *file = str; - } else { - /* don't need our dup as the fname wasn't requested, so free it */ - FREE(str); - } + (*backup)->name = str; + (*backup)->hash = NULL; return 0; } *ptr = '\0'; ptr++; /* now str points to the filename and ptr points to the hash */ - if(file) { - *file = strdup(str); - } - if(hash) { - *hash = strdup(ptr); - } + STRDUP((*backup)->name, str, return -1); + STRDUP((*backup)->hash, ptr, return -1); FREE(str); - return 1; -} - -char *_alpm_backup_file(const char *string) -{ - char *file = NULL; - backup_split(string, &file, NULL); - return file; -} - -char *_alpm_backup_hash(const char *string) -{ - char *hash = NULL; - backup_split(string, NULL, &hash); - return hash; + return 0; } -/* Look for a filename in a pmpkg_t.backup list. If we find it, - * then we return the md5 hash (parsed from the same line) +/* Look for a filename in a pmpkg_t.backup list. If we find it, + * then we return the full backup entry. */ -char *_alpm_needbackup(const char *file, const alpm_list_t *backup) +pmbackup_t *_alpm_needbackup(const char *file, const alpm_list_t *backup) { const alpm_list_t *lp; @@ -89,23 +68,32 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup) /* run through the backup list and parse out the hash for our file */ for(lp = backup; lp; lp = lp->next) { - char *filename = NULL; - char *hash = NULL; + pmbackup_t *backup = lp->data; - /* no hash found */ - if(!backup_split((char *)lp->data, &filename, &hash)) { - FREE(filename); - continue; + if(strcmp(file, backup->name) == 0) { + return backup; } - if(strcmp(file, filename) == 0) { - FREE(filename); - return hash; - } - FREE(filename); - FREE(hash); } return NULL; } +void _alpm_backup_free(pmbackup_t *backup) +{ + free(backup->name); + free(backup->hash); + free(backup); +} + +pmbackup_t *_alpm_backup_dup(const pmbackup_t *backup) +{ + pmbackup_t *newbackup; + CALLOC(newbackup, 1, sizeof(pmbackup_t), return NULL); + + STRDUP(newbackup->name, backup->name, return NULL); + STRDUP(newbackup->hash, backup->hash, return NULL); + + return newbackup; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 9475aa2..2f632d4 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -21,10 +21,12 @@ #define _ALPM_BACKUP_H #include "alpm_list.h" +#include "alpm.h" -char *_alpm_backup_file(const char *string); -char *_alpm_backup_hash(const char *string); -char *_alpm_needbackup(const char *file, const alpm_list_t *backup); +int _alpm_split_backup(const char *string, pmbackup_t **backup); +pmbackup_t *_alpm_needbackup(const char *file, const alpm_list_t *backup); +void _alpm_backup_free(pmbackup_t *backup); +pmbackup_t *_alpm_backup_dup(const pmbackup_t *backup); #endif /* _ALPM_BACKUP_H */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index ee28db5..4b2a301 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -625,9 +625,12 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } } else if(strcmp(line, "%BACKUP%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, line, goto error); - info->backup = alpm_list_add(info->backup, linedup); + pmbackup_t *backup; + CALLOC(backup, 1, sizeof(pmbackup_t), goto error); + if(_alpm_split_backup(line, &backup)) { + goto error; + } + info->backup = alpm_list_add(info->backup, backup); } } } @@ -826,7 +829,8 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(info->backup) { fprintf(fp, "%%BACKUP%%\n"); for(lp = info->backup; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); + pmbackup_t *backup = lp->data; + fprintf(fp, "%s\t%s\n", backup->name, backup->hash); } fprintf(fp, "\n"); } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 94df071..1807051 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -200,7 +200,10 @@ static int parse_descfile(pmhandle_t *handle, struct archive *a, pmpkg_t *newpkg } else if(strcmp(key, "provides") == 0) { newpkg->provides = alpm_list_add(newpkg->provides, strdup(ptr)); } else if(strcmp(key, "backup") == 0) { - newpkg->backup = alpm_list_add(newpkg->backup, strdup(ptr)); + pmbackup_t *backup; + CALLOC(backup, 1, sizeof(pmbackup_t), return -1); + STRDUP(backup->name, ptr, return -1); + newpkg->backup = alpm_list_add(newpkg->backup, backup); } else if(strcmp(key, "force") == 0) { /* deprecated, skip it */ } else if(strcmp(key, "makepkgopt") == 0) { diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 0b0e974..e99d5bd 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -459,7 +459,9 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->replaces = alpm_list_strdup(pkg->replaces); newpkg->groups = alpm_list_strdup(pkg->groups); newpkg->files = alpm_list_strdup(pkg->files); - newpkg->backup = alpm_list_strdup(pkg->backup); + for(i = pkg->backup; i; i = alpm_list_next(i)) { + newpkg->backup = alpm_list_add(newpkg->backup, _alpm_backup_dup(i->data)); + } for(i = pkg->depends; i; i = alpm_list_next(i)) { newpkg->depends = alpm_list_add(newpkg->depends, _alpm_dep_dup(i->data)); } @@ -507,7 +509,8 @@ void _alpm_pkg_free(pmpkg_t *pkg) FREELIST(pkg->replaces); FREELIST(pkg->groups); FREELIST(pkg->files); - FREELIST(pkg->backup); + alpm_list_free_inner(pkg->backup, (alpm_list_fn_free)_alpm_backup_free); + alpm_list_free(pkg->backup); alpm_list_free_inner(pkg->depends, (alpm_list_fn_free)_alpm_dep_free); alpm_list_free(pkg->depends); FREELIST(pkg->optdepends); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index bc5b267..d18020d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -30,6 +30,7 @@ #include <time.h> /* time_t */ #include "alpm.h" +#include "backup.h" #include "db.h" #include "signing.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9f07501..b6a4c71 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -254,16 +254,14 @@ static void unlink_file(pmhandle_t *handle, pmpkg_t *info, const char *filename, } } else { /* if the file needs backup and has been modified, back it up to .pacsave */ - char *pkghash = _alpm_needbackup(filename, alpm_pkg_get_backup(info)); - if(pkghash) { + pmbackup_t *backup = _alpm_needbackup(filename, alpm_pkg_get_backup(info)); + if(backup) { if(nosave) { _alpm_log(handle, PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file); - FREE(pkghash); } else { char *filehash = alpm_compute_md5sum(file); - int cmp = filehash ? strcmp(filehash, pkghash) : 0; + int cmp = filehash ? strcmp(filehash, backup->hash) : 0; FREE(filehash); - FREE(pkghash); if(cmp != 0) { char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacsave", file); @@ -309,20 +307,20 @@ int _alpm_upgraderemove_package(pmhandle_t *handle, /* old package backup list */ alpm_list_t *filelist = alpm_pkg_get_files(newpkg); for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - char *backup = _alpm_backup_file(b->data); + const pmbackup_t *backup = b->data; /* safety check (fix the upgrade026 pactest) */ - if(!alpm_list_find_str(filelist, backup)) { - FREE(backup); + if(!alpm_list_find_str(filelist, backup->name)) { continue; } - _alpm_log(handle, PM_LOG_DEBUG, "adding %s to the skip_remove array\n", backup); - skip_remove = alpm_list_add(skip_remove, backup); + _alpm_log(handle, PM_LOG_DEBUG, "adding %s to the skip_remove array\n", + backup->name); + skip_remove = alpm_list_add(skip_remove, strdup(backup->name)); } for(lp = files; lp; lp = lp->next) { if(!can_remove_file(handle, lp->data, skip_remove)) { - _alpm_log(handle, PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", - pkgname); + _alpm_log(handle, PM_LOG_DEBUG, + "not removing package '%s', can't remove all files\n", pkgname); RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); } } diff --git a/src/pacman/package.c b/src/pacman/package.c index 9cdb487..32156c5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -151,12 +151,12 @@ void dump_pkg_full(pmpkg_t *pkg, enum pkg_from from, int extra) } static const char *get_backup_file_status(const char *root, - const char *filename, const char *expected_md5) + const pmbackup_t *backup) { char path[PATH_MAX]; const char *ret; - snprintf(path, PATH_MAX, "%s%s", root, filename); + snprintf(path, PATH_MAX, "%s%s", root, backup->name); /* if we find the file, calculate checksums, otherwise it is missing */ if(access(path, R_OK) == 0) { @@ -169,7 +169,7 @@ static const char *get_backup_file_status(const char *root, } /* if checksums don't match, file has been modified */ - if(strcmp(md5sum, expected_md5) != 0) { + if(strcmp(md5sum, backup->hash) != 0) { ret = "MODIFIED"; } else { ret = "UNMODIFIED"; @@ -200,18 +200,13 @@ void dump_pkg_backups(pmpkg_t *pkg) if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { + const pmbackup_t *backup = alpm_list_getdata(i); const char *value; - char *str = strdup(alpm_list_getdata(i)); - char *ptr = strchr(str, '\t'); - if(ptr == NULL) { - free(str); + if(!backup->hash) { continue; } - *ptr = '\0'; - ptr++; - value = get_backup_file_status(root, str, ptr); - printf("%s\t%s%s\n", value, root, str); - free(str); + value = get_backup_file_status(root, backup); + printf("%s\t%s%s\n", value, root, backup->name); } } else { /* package had no backup files */ -- 1.7.5.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-278-g34876e4
by dan＠archlinux.org 20 Jun '11

20 Jun '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 34876e4fe9707de961318da28dba604dffff6d49 (commit) via 36d98b3919d37c7f376c9f0f787a3b4b660da73e (commit) via 83071f579c4ae14c469d83caa71e80a4be3689df (commit) via d980bd403d77933ea2b6636a296f6f905ef992a4 (commit) via 620cddfc13fb2b2c9f1086ab201db5db3e25be1f (commit) via 0f26e3aa5b91ffc0a5bef9a0f0bb9d40ec198407 (commit) via deb5601d8d19760fd569abe3508786d97cc1ceba (commit) via 0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e (commit) via eb2d607899117757971186845930242c4541bfb4 (commit) via 36ae77dd4982fd29d73b695913f88665ab1d546a (commit) via 25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb (commit) via 51359e6d33cf2f3f3acf95ad526c5b22e39d86cf (commit) via 7f6c1a76c66fb718fad2ecce68f99ee13d18ff15 (commit) via 19fcc7401666cd892f7b8a5a49854a1b2eb9988b (commit) via bdf00d3dbd19c3def6127f3d372d630930a26abb (commit) via 1cd6515af0ae5d1c3dabd30749a37cfefa7dc4f5 (commit) from d21f6ca4aa3209938fa312f29ac03446f57e6a66 (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 34876e4fe9707de961318da28dba604dffff6d49 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Jun 17 22:06:44 2011 +0200 makepkg: fix broken syntax (double $) Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36d98b3919d37c7f376c9f0f787a3b4b660da73e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 20 00:18:29 2011 -0500 Improve cachedir removal and error handling * Check the return value of canonicalize_path() for non-NULL * Use ASSERT and RET_ERR as appropriate * Make remove_cachedir() use same path munge logic as add_cachedir() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83071f579c4ae14c469d83caa71e80a4be3689df Author: Kerrick Staley <mail(a)kerrickstaley.com> Date: Sat Jun 18 23:24:05 2011 -0500 Documented _alpm_download() Documented the _alpm_download() function in dload.c Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d980bd403d77933ea2b6636a296f6f905ef992a4 Author: Kerrick Staley <mail(a)kerrickstaley.com> Date: Sat Jun 18 23:24:06 2011 -0500 Documented purpose of be_*.c Added a line to the top of each of be_local.c, be_package.c, and be_sync.c indicating their purposes. Signed-off-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 620cddfc13fb2b2c9f1086ab201db5db3e25be1f Author: Dave Reisner <d(a)falconindy.com> Date: Mon Jun 13 22:23:49 2011 -0400 pacman/util.c: support terminals with unknown width Add detection for stdout being attached to a tty device. When this check fails, return a default width of 0, which callers interpret to mean "don't wrap". Conversely, when our term ioctl suceeds but returns 0, we interpret this to mean a tty with an unknown width (e.g., a serial console), in which case we default to a sane value of 80. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 0f26e3aa5b91ffc0a5bef9a0f0bb9d40ec198407 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:03:33 2011 -0500 Correctly duplicate delta objects We were using copy_data before; this works for the struct itself but not the strings contained within. Fix it up by duplicating all the data as we do with our other structures. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit deb5601d8d19760fd569abe3508786d97cc1ceba Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:16:37 2011 -0500 Clean up util md5sum method Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ee9ced4cbcff27823d4a1d5e0ef8a49dfc9dd8e Merge: eb2d607 25b7df4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 20 00:07:10 2011 -0500 Merge branch 'public-structs' commit eb2d607899117757971186845930242c4541bfb4 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Jun 19 08:47:23 2011 -0400 lib/handle: use CALLOC macro instead of bare calloc Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36ae77dd4982fd29d73b695913f88665ab1d546a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 18 20:44:49 2011 -0500 Don't call public API in _alpm_log() Calling get_logcb() here would reset any previous setting of handle->pm_errno due to the CHECK_HANDLE() macro contained within. This would make error setting a bit funny if one set pm_errno before calling _alpm_log(), such as in the RET_ERR() macro. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 25b7df4dab61e908a0f86e3aad51f1f5c9ed2ccb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 11:55:26 2011 -0500 Make pmgrp_t public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 51359e6d33cf2f3f3acf95ad526c5b22e39d86cf Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 11:49:34 2011 -0500 Make pmdelta_t public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f6c1a76c66fb718fad2ecce68f99ee13d18ff15 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 11:42:10 2011 -0500 Make pmdepend_t and pmdepmissing_t public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19fcc7401666cd892f7b8a5a49854a1b2eb9988b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 11:33:20 2011 -0500 Make struct pmconflict_t public Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bdf00d3dbd19c3def6127f3d372d630930a26abb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 11:27:44 2011 -0500 Make pmfileconflict_t type public This removes the need to write accessor methods for every type we have, and simplifies the API. Any type that doesn't need magic* can be converted in this fashion to make it easier for frontend applications to use, as well as make it less of a pain to introduce new such structs in the future. * "magic" meaning something like pmpkg_t where values can be lazy loaded. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1cd6515af0ae5d1c3dabd30749a37cfefa7dc4f5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 15 12:02:29 2011 -0500 API: change 'signaturedir' to 'gpgdir' This is more in line with reality and what we have our makepkg, etc. options named anyway. Original-patch-by: Kerrick Staley <mail(a)kerrickstaley.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 170 +++++++++++++++++++++++---------------------- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 42 ----------- lib/libalpm/conflict.h | 13 ---- lib/libalpm/delta.c | 61 ++++++----------- lib/libalpm/delta.h | 16 +---- lib/libalpm/deps.c | 38 +---------- lib/libalpm/deps.h | 15 ---- lib/libalpm/dload.c | 10 +++ lib/libalpm/group.c | 12 --- lib/libalpm/group.h | 7 -- lib/libalpm/handle.c | 46 ++++++------ lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 5 +- lib/libalpm/package.c | 4 +- lib/libalpm/signing.c | 2 +- lib/libalpm/sync.c | 10 +-- lib/libalpm/util.c | 3 +- scripts/makepkg.sh.in | 2 +- src/pacman/callback.c | 4 +- src/pacman/conf.c | 2 +- src/pacman/pacman.c | 2 +- src/pacman/query.c | 15 ++--- src/pacman/remove.c | 8 +-- src/pacman/sync.c | 36 ++++------ src/pacman/upgrade.c | 28 +++----- src/pacman/util.c | 24 ++++-- src/pacman/util.h | 2 +- src/util/pactree.c | 8 +- src/util/testdb.c | 9 +-- 32 files changed, 224 insertions(+), 378 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] lib/util: call _alpm_log before setting handle->pm_errno
by Dave Reisner 20 Jun '11

20 Jun '11

This is an unfortunate chain of events. RET_ERR and RET_ERR_VOID will eventually call CHECK_HANDLE, which resets the handle's pm_errno member. Dan probably had a reason for doing this, so we merely switch the order of operations in the RET_ERR macros to avoid stomping on our pm_errno. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Awesome bug. Here's what happens when the DB is locked: $ sudo pacman -Sy :: Synchronizing package databases... error: failed to init transaction (unexpected error) I'm still not sure why CHECK_HANDLE will always reset handle->pm_errno. Seems like it's some sort of lazy initialization that should be getting done elsewhere. There may be a better way to solve this, if the reset isn't actually necessary. lib/libalpm/util.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 0549c81..778e20f 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -61,12 +61,14 @@ #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0) -#define RET_ERR_VOID(handle, err) do { (handle)->pm_errno = (err); \ +#define RET_ERR_VOID(handle, err) do { \ _alpm_log(handle, PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerror(err)); \ + (handle)->pm_errno = (err); \ return; } while(0) -#define RET_ERR(handle, err, ret) do { (handle)->pm_errno = (err); \ +#define RET_ERR(handle, err, ret) do { \ _alpm_log(handle, PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerror(err)); \ + (handle)->pm_errno = (err); \ return (ret); } while(0) #define DOUBLE_EQ(x, y) (fabs((x) - (y)) < DBL_EPSILON) -- 1.7.5.4

2 1

[pacman-dev] [PATCH 0/5] Make several struct types public
by Dan McGee 19 Jun '11

19 Jun '11

I was starting to hack a bit today on the files and backup lists we have in the package to make them a bit more full featured: * files lists would have mode and size fields * backup entries would be split ahead of time, like deps and deltas And realized I didn't want to add another 30 methods to the API just to follow the current trend. So here is my patch series at reversing the status quo and bringing a hint of sanity back into how we do things. There are now only four opaque struct types left, and I don't see those changing anytime soon (pmhandle_t, pmtrans_t, pmpkg_t, pmdb_t). Feedback welcome. Dan McGee (5): Make pmfileconflict_t type public Make struct pmconflict_t public Make pmdepend_t and pmdepmissing_t public Make pmdelta_t public Make pmgrp_t public lib/libalpm/alpm.h | 162 ++++++++++++++++++++++++----------------------- lib/libalpm/conflict.c | 42 ------------ lib/libalpm/conflict.h | 13 ---- lib/libalpm/delta.c | 43 ++----------- lib/libalpm/delta.h | 15 ----- lib/libalpm/deps.c | 38 +----------- lib/libalpm/deps.h | 15 ----- lib/libalpm/group.c | 12 ---- lib/libalpm/group.h | 7 -- lib/libalpm/sync.c | 10 +-- src/pacman/query.c | 15 ++--- src/pacman/remove.c | 8 +-- src/pacman/sync.c | 36 +++++------ src/pacman/upgrade.c | 28 +++----- src/util/pactree.c | 8 +- src/util/testdb.c | 9 +-- 16 files changed, 137 insertions(+), 324 deletions(-) -- 1.7.5.4

2 6

[pacman-dev] [PATCH 1/3] Changed all references to signature verification level in libalpm symbols to 'verifysig'. Removed references to PGP in libalpm symbols. Signed-off-by: Kerrick Staley <mail@kerrickstaley.com>
by Kerrick Staley 19 Jun '11

19 Jun '11

--- lib/libalpm/alpm.h | 24 ++++++++++++------------ lib/libalpm/be_package.c | 10 +++++----- lib/libalpm/be_sync.c | 10 +++++----- lib/libalpm/db.c | 6 +++--- lib/libalpm/db.h | 2 +- lib/libalpm/dload.c | 6 +++--- lib/libalpm/handle.c | 14 +++++++------- lib/libalpm/handle.h | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 14 +++++++------- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 4 ++-- src/pacman/conf.c | 24 ++++++++++++------------ src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/util/testpkg.c | 2 +- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5af843c..c779a06 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -63,12 +63,12 @@ typedef enum _pmpkgreason_t { /** * GPG signature verification options */ -typedef enum _pgp_verify_t { - PM_PGP_VERIFY_UNKNOWN, - PM_PGP_VERIFY_NEVER, - PM_PGP_VERIFY_OPTIONAL, - PM_PGP_VERIFY_ALWAYS -} pgp_verify_t; +typedef enum pmverifysig_t { + PM_VERIFYSIG_UNKNOWN, + PM_VERIFYSIG_NEVER, + PM_VERIFYSIG_OPTIONAL, + PM_VERIFYSIG_ALWAYS +} pmverifysig_t; /* * Structures @@ -263,8 +263,8 @@ int alpm_option_set_usedelta(int usedelta); int alpm_option_get_checkspace(void); int alpm_option_set_checkspace(int checkspace); -pgp_verify_t alpm_option_get_default_sigverify(void); -int alpm_option_set_default_sigverify(pgp_verify_t level); +pmverifysig_t alpm_option_get_default_verifysig(void); +int alpm_option_set_default_verifysig(pmverifysig_t level); /** @} */ @@ -389,7 +389,7 @@ int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); * @param pkg address of the package pointer * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_pkg_load(const char *filename, int full, pgp_verify_t check_sig, +int alpm_pkg_load(const char *filename, int full, pmverifysig_t check_sig, pmpkg_t **pkg); /** Free a package. @@ -626,10 +626,10 @@ alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg); * Signatures */ -int alpm_pkg_check_pgp_signature(pmpkg_t *pkg); +int alpm_pkg_check_signature(pmpkg_t *pkg); -int alpm_db_check_pgp_signature(pmdb_t *db); -int alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify); +int alpm_db_check_signature(pmdb_t *db); +int alpm_db_set_verifysig(pmdb_t *db, pmverifysig_t verify); /* * Deltas diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 9e59d69..173bd4b 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -227,7 +227,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) * @return An information filled pmpkg_t struct */ pmpkg_t *_alpm_pkg_load_internal(const char *pkgfile, int full, - const char *md5sum, const char *base64_sig, pgp_verify_t check_sig) + const char *md5sum, const char *base64_sig, pmverifysig_t check_sig) { int ret; int config = 0; @@ -266,11 +266,11 @@ pmpkg_t *_alpm_pkg_load_internal(const char *pkgfile, int full, } _alpm_log(PM_LOG_DEBUG, "base64_sig: %s\n", base64_sig); - if(check_sig != PM_PGP_VERIFY_NEVER) { + if(check_sig != PM_VERIFYSIG_NEVER) { _alpm_log(PM_LOG_DEBUG, "checking signature for %s\n", pkgfile); ret = _alpm_gpgme_checksig(pkgfile, base64_sig); - if((check_sig == PM_PGP_VERIFY_ALWAYS && ret != 0) || - (check_sig == PM_PGP_VERIFY_OPTIONAL && ret == 1)) { + if((check_sig == PM_VERIFYSIG_ALWAYS && ret != 0) || + (check_sig == PM_VERIFYSIG_OPTIONAL && ret == 1)) { RET_ERR(PM_ERR_SIG_INVALID, NULL); } } @@ -381,7 +381,7 @@ error: } int SYMEXPORT alpm_pkg_load(const char *filename, int full, - pgp_verify_t check_sig, pmpkg_t **pkg) + pmverifysig_t check_sig, pmpkg_t **pkg) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 9d85a45..3294f45 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -85,7 +85,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) size_t len; int ret = -1; mode_t oldmask; - pgp_verify_t check_sig; + pmverifysig_t check_sig; ALPM_LOG_FUNC; @@ -117,7 +117,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) } } - check_sig = _alpm_db_get_sigverify_level(db); + check_sig = _alpm_db_get_verifysig(db); for(i = db->servers; i; i = i->next) { const char *server = i->data; @@ -132,9 +132,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) ret = _alpm_download(fileurl, syncpath, force, 0, 0); - if(ret == 0 && (check_sig == PM_PGP_VERIFY_ALWAYS || - check_sig == PM_PGP_VERIFY_OPTIONAL)) { - int errors_ok = (check_sig == PM_PGP_VERIFY_OPTIONAL); + if(ret == 0 && (check_sig == PM_VERIFYSIG_ALWAYS || + check_sig == PM_VERIFYSIG_OPTIONAL)) { + int errors_ok = (check_sig == PM_VERIFYSIG_OPTIONAL); /* if we downloaded a DB, we want the .sig from the same server */ snprintf(fileurl, len, "%s/%s.db.sig", server, db->treename); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 3133614..d062a92 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -225,17 +225,17 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url) } /** Set the verify gpg signature option for a database. * @param db database pointer - * @param verify enum pgp_verify_t + * @param verify enum pmverifysig_t * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) +int SYMEXPORT alpm_db_set_verifysig(pmdb_t *db, pmverifysig_t verify) { ALPM_LOG_FUNC; /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - db->pgp_verify = verify; + db->verifysig = verify; _alpm_log(PM_LOG_DEBUG, "adding VerifySig option to database '%s': %d\n", db->treename, verify); diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 399e2d5..23dffb7 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -63,7 +63,7 @@ struct __pmdb_t { pmpkghash_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; - pgp_verify_t pgp_verify; + pmverifysig_t verifysig; struct db_operations *ops; }; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index d024c73..9d44ce7 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -351,11 +351,11 @@ char SYMEXPORT *alpm_fetch_pkgurl(const char *url) _alpm_log(PM_LOG_DEBUG, "successfully downloaded %s\n", url); /* attempt to download the signature */ - if(ret == 0 && (handle->sigverify == PM_PGP_VERIFY_ALWAYS || - handle->sigverify == PM_PGP_VERIFY_OPTIONAL)) { + if(ret == 0 && (handle->verifysig == PM_VERIFYSIG_ALWAYS || + handle->verifysig == PM_VERIFYSIG_OPTIONAL)) { char *sig_url; size_t len; - int errors_ok = (handle->sigverify == PM_PGP_VERIFY_OPTIONAL); + int errors_ok = (handle->verifysig == PM_VERIFYSIG_OPTIONAL); len = strlen(url) + 5; CALLOC(sig_url, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL)); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 39b3b60..4999244 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -46,7 +46,7 @@ pmhandle_t *_alpm_handle_new() CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL)); - handle->sigverify = PM_PGP_VERIFY_OPTIONAL; + handle->verifysig = PM_VERIFYSIG_OPTIONAL; return handle; } @@ -627,18 +627,18 @@ int SYMEXPORT alpm_option_set_checkspace(int checkspace) return 0; } -int SYMEXPORT alpm_option_set_default_sigverify(pgp_verify_t level) +int SYMEXPORT alpm_option_set_default_verifysig(pmverifysig_t level) { ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); - ASSERT(level != PM_PGP_VERIFY_UNKNOWN, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - handle->sigverify = level; + ASSERT(level != PM_VERIFYSIG_UNKNOWN, RET_ERR(PM_ERR_WRONG_ARGS, -1)); + handle->verifysig = level; return 0; } -pgp_verify_t SYMEXPORT alpm_option_get_default_sigverify() +pmverifysig_t SYMEXPORT alpm_option_get_default_verifysig() { - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, PM_PGP_VERIFY_UNKNOWN)); - return handle->sigverify; + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, PM_VERIFYSIG_UNKNOWN)); + return handle->verifysig; } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index aa00b6f..5bd41f1 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -72,7 +72,7 @@ typedef struct _pmhandle_t { char *arch; /* Architecture of packages we should allow */ int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ - pgp_verify_t sigverify; /* Default signature verification level */ + pmverifysig_t verifysig; /* Default signature verification level */ } pmhandle_t; /* global handle variable */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index debb239..f3b3d26 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -141,7 +141,7 @@ void _alpm_pkg_free(pmpkg_t *pkg); void _alpm_pkg_free_trans(pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load_internal(const char *filename, int full, - const char *md5sum, const char *base64_sig, pgp_verify_t check_sig); + const char *md5sum, const char *base64_sig, pmverifysig_t check_sig); int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 9bb9d0a..1a99c8f 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -369,15 +369,15 @@ int _alpm_gpgme_checksig(const char *path, const char *base64_sig) * * @return signature verification level */ -pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) +pmverifysig_t _alpm_db_get_verifysig(pmdb_t *db) { ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, PM_PGP_VERIFY_UNKNOWN)); + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, PM_VERIFYSIG_UNKNOWN)); - if(db->pgp_verify != PM_PGP_VERIFY_UNKNOWN) { - return db->pgp_verify; + if(db->verifysig != PM_VERIFYSIG_UNKNOWN) { + return db->verifysig; } else { - return alpm_option_get_default_sigverify(); + return alpm_option_get_default_verifysig(); } } @@ -386,7 +386,7 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) * @param pkg the package to check * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) */ -int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) +int SYMEXPORT alpm_pkg_check_signature(pmpkg_t *pkg) { ALPM_LOG_FUNC; ASSERT(pkg != NULL, return 0); @@ -399,7 +399,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) * @param db the database to check * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) */ -int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) +int SYMEXPORT alpm_db_check_signature(pmdb_t *db) { ALPM_LOG_FUNC; ASSERT(db != NULL, return 0); diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 8d8c164..253a919 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -22,7 +22,7 @@ #include "alpm.h" int _alpm_gpgme_checksig(const char *path, const char *base64_sig); -pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db); +pmverifysig_t _alpm_db_get_verifysig(pmdb_t *db); #endif /* _ALPM_SIGNING_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8dd51aa..6b99e08 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -866,7 +866,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) int percent = (current * 100) / numtargs; const char *filename; char *filepath; - pgp_verify_t check_sig; + pmverifysig_t check_sig; PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent, numtargs, current); @@ -877,7 +877,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) filename = alpm_pkg_get_filename(spkg); filepath = _alpm_filecache_find(filename); pmdb_t *sdb = alpm_pkg_get_db(spkg); - check_sig = _alpm_db_get_sigverify_level(sdb); + check_sig = _alpm_db_get_verifysig(sdb); /* load the package file and replace pkgcache entry with it in the target list */ /* TODO: alpm_pkg_get_db() will not work on this target anymore */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 370ec51..a872d3f 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -214,17 +214,17 @@ int config_set_arch(const char *arch) } } -static pgp_verify_t option_verifysig(const char *value) +static pmverifysig_t option_verifysig(const char *value) { - pgp_verify_t level; + pmverifysig_t level; if(strcmp(value, "Always") == 0) { - level = PM_PGP_VERIFY_ALWAYS; + level = PM_VERIFYSIG_ALWAYS; } else if(strcmp(value, "Optional") == 0) { - level = PM_PGP_VERIFY_OPTIONAL; + level = PM_VERIFYSIG_OPTIONAL; } else if(strcmp(value, "Never") == 0) { - level = PM_PGP_VERIFY_NEVER; + level = PM_VERIFYSIG_NEVER; } else { - level = PM_PGP_VERIFY_UNKNOWN; + level = PM_VERIFYSIG_UNKNOWN; } pm_printf(PM_LOG_DEBUG, "config: VerifySig = %s (%d)\n", value, level); return level; @@ -359,9 +359,9 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "CleanMethod") == 0) { setrepeatingoption(value, "CleanMethod", option_add_cleanmethod); } else if(strcmp(key, "VerifySig") == 0) { - pgp_verify_t level = option_verifysig(value); - if(level != PM_PGP_VERIFY_UNKNOWN) { - alpm_option_set_default_sigverify(level); + pmverifysig_t level = option_verifysig(value); + if(level != PM_VERIFYSIG_UNKNOWN) { + alpm_option_set_default_verifysig(level); } else { pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' has invalid value '%s'\n"), @@ -634,9 +634,9 @@ static int _parseconfig(const char *file, int parse_options, goto cleanup; } } else if(strcmp(key, "VerifySig") == 0) { - pgp_verify_t level = option_verifysig(value); - if(level != PM_PGP_VERIFY_UNKNOWN) { - ret = alpm_db_set_pgp_verify(db, level); + pmverifysig_t level = option_verifysig(value); + if(level != PM_VERIFYSIG_UNKNOWN) { + ret = alpm_db_set_verifysig(db, level); if(ret != 0) { pm_printf(PM_LOG_ERROR, _("could not add set verify option for database '%s': %s (%s)\n"), alpm_db_get_name(db), value, alpm_strerrorlast()); diff --git a/src/pacman/query.c b/src/pacman/query.c index d1105b4..87f06c4 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -551,7 +551,7 @@ int pacman_query(alpm_list_t *targets) char *strname = alpm_list_getdata(i); if(config->op_q_isfile) { - alpm_pkg_load(strname, 1, PM_PGP_VERIFY_OPTIONAL, &pkg); + alpm_pkg_load(strname, 1, PM_VERIFYSIG_OPTIONAL, &pkg); } else { pkg = alpm_db_get_pkg(db_local, strname); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 884504f..8e2c236 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -219,7 +219,7 @@ static int sync_cleancache(int level) /* attempt to load the package, prompt removal on failures as we may have * files here that aren't valid packages. we also don't need a full * load of the package, just the metadata. */ - if(alpm_pkg_load(path, 0, PM_PGP_VERIFY_NEVER, &localpkg) != 0 + if(alpm_pkg_load(path, 0, PM_VERIFYSIG_NEVER, &localpkg) != 0 || localpkg == NULL) { if(yesno(_("File %s does not seem to be a valid package, remove it?"), path)) { diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 0ffc94c..7a955e2 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -42,7 +42,7 @@ int pacman_upgrade(alpm_list_t *targets) { alpm_list_t *i, *data = NULL; - pgp_verify_t check_sig = alpm_option_get_default_sigverify(); + pmverifysig_t check_sig = alpm_option_get_default_verifysig(); int retval = 0; if(targets == NULL) { diff --git a/src/util/testpkg.c b/src/util/testpkg.c index ad6ec30..4568262 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) /* let us get log messages from libalpm */ alpm_option_set_logcb(output_cb); - if(alpm_pkg_load(argv[1], 1, PM_PGP_VERIFY_OPTIONAL, &pkg) == -1 + if(alpm_pkg_load(argv[1], 1, PM_VERIFYSIG_OPTIONAL, &pkg) == -1 || pkg == NULL) { switch(pm_errno) { case PM_ERR_PKG_OPEN: -- 1.7.5.2

5 30

[pacman-dev] [PATCH] makepkg: fix broken syntax (double $)
by Florian Pritz 18 Jun '11

18 Jun '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- 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 dfb7976..78cd4cf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -977,7 +977,7 @@ find_libprovides() { soarch=$(LC_ALL=C readelf -h "$filename" | sed -n 's/.*Class.*ELF$32\|64$/\1/p') # get the string binaries link to: libfoo.so.1.2 -> libfoo.so.1 sofile=$(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') - [ -z "$sofile" ] && sofile="${$filename##*/}" + [ -z "$sofile" ] && sofile="${filename##*/}" # extract the library name: libfoo.so soname="${sofile%%\.so\.*}.so" -- 1.7.5.4

2 1

[pacman-dev] Package checking options (was: Changed all references to signature verification level in libalpm symbols to 'verifysig'.)
by Dan McGee 17 Jun '11

17 Jun '11

On Sun, Jun 12, 2011 at 3:15 AM, Kerrick Staley <mail(a)kerrickstaley.com> wrote: > I inadvertently broke my email account when I configured > git-send-mail, and I only just realized it. Everything I've sent to > the list since then didn't go through, so I'm resending this message, > originally sent June 5 (I edited/updated it). > > Whatever we call the variable doesn't really matter; I like SigLevel. > > I'm working on a patch that will implement the below behavior. It's > just taking a while because it's somewhat complicated. > > ======== > > Config: > > # Action to take (warn or abort) when packages and databases are > unsigned but were previously signed > SigPreviouslySigned = warn > > # Action to take (accept, warn, or abort) when neither the package nor > the database have a signature > SigNoSignature = warn > > # Action to take (accept, warn, or abort) when a package is signed but > the database is unsigned > # SigDatabaseUnsigned = accept > > # Action to take (accept, warn, or abort) when a package is unsigned > but has a SHA256 hash in a signed database > # SigHashed = accept This is absurd as far as configuration goes. Why would we have 126 separate directives for what boils down to one thing, which as Allan and I said, could be called "CheckLevel"? ~~~~ CheckLevel = Required SignedPackage SignedDatabase NoAllowUnknown [another-repo] CheckLevel = Optional [someones-repo] CheckLevel = NoSignedDatabase AllowUnknown [insecureRepo] CheckLevel = Never ~~~~ SigPreviouslySigned- an interesting thought, but definitely not something we need on first pass- there are also a multitude of issues here considering everyone starts from a different point. If you want to be protected against this kind of attack, just use Required/Always/whatever we call it. SigHashed- covered by my previous suggestion; here it would be "CheckLevel = Required SignedDatabase NoSignedPackage" > ======== > > A) When handling a given situation, there are three actions that can be taken: > 1. The situation is accepted silently. > 2. The situation is accepted with a warning. > 3. Installation/update is aborted, unless an override flag is passed, > in which case a warning will be given. > > B) For a database, consider whether it should have a signature: > 1. If SigDatabaseUnsigned = abort, but the .sig file cannot be > downloaded, then keep checking servers until a .sig can be gotten, and > give a warning each time a .sig download returns a 404. > 2. If not (1) but, based on the various config settings, having an > unsigned database would result in more warnings or aborts than a > signed one, then check servers for a .sig until you get a .sig or you > get 3 404's; if you get 3 404's, rescan through the list from the > beginning, not checking for .sig's this time. Again, give a warning > whenever a 404 happens. > 3. If not (1)/(2), don't check for .sig's. > > C) For a package, consider whether it should have a signature: > 1. If the package was previously signed but now isn't, act based on > SigPreviouslySigned. > 2. For local packages, if the package indicates it should have a > signature (mechanism to be implemented) but it doesn't, abort. > > D) Outcomes for package/database signature validity ("signed" means > GPGME_SIGSUM_VALID w/ GPGME_VALIDITY_{FULL,ULTIMATE}; "unsigned" means > GPGME_SIGSUM_KEY_MISSING or no signature present, "bad" means anything > else): > 1. The package or database or both have bad signatures. Abort > (could happen during database unpacking; the rest only happen on > package check). > 2. The package and database are signed. Accept. > 3. The package is unsigned but the database is signed and the database > uses SHA256. Act based on SigHashed. > 4. The package is signed but the database is unsigned. Act based on > SigDatabaseUnsigned. > 5. The package is unsigned and the database is unsigned. Act based on > SigNoSignature. > > ======== > > Notes: > > I invented the config names more or less randomly; if you have strong > objections, we'll change them, otherwise let's go with these. I have objections on your way of going about business here. I present what i thought was a reasonable approach, got some feedback by Allan, and then you attempt to throw something completely different at us without really responding to what is wrong with my proposal. I'm trying my hardest to not get seen as a stick in the mud and impediment to progress here, but it is damn hard to keep my cool when my years of experience with this codebase gets shoved aside without so much as a "I don't think you considered this" bit of feedback. My ideas tend to be backed by those years of experience, and adding config options is not something we like to do willy-nilly, nor do we want a complicated config file. > I've made pmsiglevel_t into a struct with 4 enum members; I'm > currently passing it around by value (not with pointers); please give > me a heads-up if you don't think I should do it this way. The usual preference in C is to use bitflags for things like this. > No marginal signatures should come up, because I don't think we should > use such signatures during the interim when not all developers have > fully validated keys; a developer's key can just be excluded from > pacman-keyring until it is fully validated. That is a pretty bold assumption. You do realize there are more repos out there that are not provided by a distro that people might want to use and have signatures involved, right? -Dan

3 4

[pacman-dev] [PATCH] WIP: possible new siglevel layout
by Dan McGee 16 Jun '11

16 Jun '11

This is a proposed new siglevel enum that will allow configuration of all the various combinations of signature checking. It is done via bitflags. To get any checking at all, at least one of PM_CHECK_PACKAGE or PM_CHECK_DATABASE must be flipped on. These can be made optional on an independent basis. Additional flags exist for UNKNOWN and MARGINAL signatures. Proof of concept only; still missing pieces here to be implemented like the actual handling of UNKNOWN/MARGINAL. --- lib/libalpm/alpm.h | 37 ++++++++++++++++++++++++------------- lib/libalpm/be_package.c | 12 ++++++------ lib/libalpm/be_sync.c | 23 +++++++++++------------ lib/libalpm/db.c | 33 +++++++++++++-------------------- lib/libalpm/db.h | 4 ++-- lib/libalpm/dload.c | 5 ++--- lib/libalpm/handle.c | 14 +++++++------- lib/libalpm/handle.h | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 15 --------------- lib/libalpm/signing.h | 1 - lib/libalpm/sync.c | 6 +++--- src/pacman/conf.c | 38 ++++++++++++++++++++------------------ src/pacman/conf.h | 2 +- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 4 ++-- src/util/cleanupdelta.c | 3 ++- src/util/testdb.c | 3 ++- src/util/testpkg.c | 3 ++- 20 files changed, 101 insertions(+), 110 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b62c62d..bdb2383 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -63,12 +63,16 @@ typedef enum _pmpkgreason_t { /** * GPG signature verification options */ -typedef enum _pgp_verify_t { - PM_PGP_VERIFY_UNKNOWN, - PM_PGP_VERIFY_NEVER, - PM_PGP_VERIFY_OPTIONAL, - PM_PGP_VERIFY_ALWAYS -} pgp_verify_t; +typedef enum _pmsiglevel_t { + PM_SIG_PACKAGE = (1 << 0), + PM_SIG_PACKAGE_OPTIONAL = (1 << 1), + PM_SIG_DATABASE = (1 << 2), + PM_SIG_DATABASE_OPTIONAL = (1 << 3), + PM_SIG_UNKNOWN_OK = (1 << 4), + PM_SIG_MARGINAL_OK = (1 << 5), + + PM_SIG_USE_DEFAULT = (1 << 31), +} pmsiglevel_t; /* * Structures @@ -247,8 +251,8 @@ int alpm_option_set_usedelta(pmhandle_t *handle, int usedelta); int alpm_option_get_checkspace(pmhandle_t *handle); int alpm_option_set_checkspace(pmhandle_t *handle, int checkspace); -pgp_verify_t alpm_option_get_default_sigverify(pmhandle_t *handle); -int alpm_option_set_default_sigverify(pmhandle_t *handle, pgp_verify_t level); +pmsiglevel_t alpm_option_get_default_siglevel(pmhandle_t *handle); +int alpm_option_set_default_siglevel(pmhandle_t *handle, pmsiglevel_t level); /** @} */ @@ -276,12 +280,12 @@ alpm_list_t *alpm_option_get_syncdbs(pmhandle_t *handle); /** Register a sync database of packages. * @param handle the context handle * @param treename the name of the sync repository - * @param check_sig what level of signature checking to perform on the + * @param level what level of signature checking to perform on the * database; note that this must be a '.sig' file type verification * @return a pmdb_t* on success (the value), NULL on error */ pmdb_t *alpm_db_register_sync(pmhandle_t *handle, const char *treename, - pgp_verify_t check_sig); + pmsiglevel_t level); /** Unregister a package database. * @param db pointer to the package database to unregister @@ -301,6 +305,14 @@ int alpm_db_unregister_all(pmhandle_t *handle); */ const char *alpm_db_get_name(const pmdb_t *db); +/** Get the signature verification level for a database. + * Will return the default verification level if this database is set up + * with PM_SIG_USE_DEFAULT. + * @param db pointer to the package database + * @return the signature verification level + */ +pmsiglevel_t alpm_db_get_siglevel(pmdb_t *db); + /** Check the validity of a database. * This is most useful for sync databases and verifying signature status. * If invalid, the handle error code will be set accordingly. @@ -377,13 +389,13 @@ int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); * @param filename location of the package tarball * @param full whether to stop the load after metadata is read or continue * through the full archive - * @param check_sig what level of package signature checking to perform on the + * @param level what level of package signature checking to perform on the * package; note that this must be a '.sig' file type verification * @param pkg address of the package pointer * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int alpm_pkg_load(pmhandle_t *handle, const char *filename, int full, - pgp_verify_t check_sig, pmpkg_t **pkg); + pmsiglevel_t level, pmpkg_t **pkg); /** Free a package. * @param pkg package pointer to free @@ -622,7 +634,6 @@ alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg); int alpm_pkg_check_pgp_signature(pmpkg_t *pkg); int alpm_db_check_pgp_signature(pmdb_t *db); -int alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify); /* * Deltas diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index a0261d0..4e09d3a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -230,7 +230,7 @@ static int parse_descfile(pmhandle_t *handle, struct archive *a, pmpkg_t *newpkg */ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, int full, const char *md5sum, const char *base64_sig, - pgp_verify_t check_sig) + pmsiglevel_t level) { int ret; int config = 0; @@ -267,11 +267,11 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, } _alpm_log(handle, PM_LOG_DEBUG, "base64_sig: %s\n", base64_sig); - if(check_sig != PM_PGP_VERIFY_NEVER) { + if(level & PM_SIG_PACKAGE) { _alpm_log(handle, PM_LOG_DEBUG, "checking signature for %s\n", pkgfile); ret = _alpm_gpgme_checksig(handle, pkgfile, base64_sig); - if((check_sig == PM_PGP_VERIFY_ALWAYS && ret != 0) || - (check_sig == PM_PGP_VERIFY_OPTIONAL && ret == 1)) { + if((!(level & PM_SIG_PACKAGE_OPTIONAL) && ret != 0) || + ((level & PM_SIG_PACKAGE_OPTIONAL) && ret == 1)) { alpm_pkg_free(newpkg); RET_ERR(handle, PM_ERR_SIG_INVALID, NULL); } @@ -384,12 +384,12 @@ error: } int SYMEXPORT alpm_pkg_load(pmhandle_t *handle, const char *filename, int full, - pgp_verify_t check_sig, pmpkg_t **pkg) + pmsiglevel_t level, pmpkg_t **pkg) { CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); - *pkg = _alpm_pkg_load_internal(handle, filename, full, NULL, NULL, check_sig); + *pkg = _alpm_pkg_load_internal(handle, filename, full, NULL, NULL, level); if(*pkg == NULL) { /* pm_errno is set by pkg_load */ return -1; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 3a8bde0..8602d5a 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -69,7 +69,7 @@ static char *get_sync_dir(pmhandle_t *handle) static int sync_db_validate(pmdb_t *db) { - pgp_verify_t check_sig; + pmsiglevel_t level; if(db->valid) { return 0; @@ -77,9 +77,9 @@ static int sync_db_validate(pmdb_t *db) /* this takes into account the default verification level if UNKNOWN * was assigned to this db */ - check_sig = _alpm_db_get_sigverify_level(db); + level = alpm_db_get_siglevel(db); - if(check_sig != PM_PGP_VERIFY_NEVER) { + if(level & PM_SIG_DATABASE) { int ret; const char *dbpath = _alpm_db_path(db); if(!dbpath) { @@ -97,8 +97,8 @@ static int sync_db_validate(pmdb_t *db) _alpm_log(db->handle, PM_LOG_DEBUG, "checking signature for %s\n", db->treename); ret = _alpm_gpgme_checksig(db->handle, dbpath, NULL); - if((check_sig == PM_PGP_VERIFY_ALWAYS && ret != 0) || - (check_sig == PM_PGP_VERIFY_OPTIONAL && ret == 1)) { + if((!(level & PM_SIG_DATABASE_OPTIONAL) && ret != 0) || + ((level & PM_SIG_DATABASE_OPTIONAL) && ret == 1)) { db->valid = 0; RET_ERR(db->handle, PM_ERR_SIG_INVALID, -1); } @@ -154,7 +154,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) int ret = -1; mode_t oldmask; pmhandle_t *handle; - pgp_verify_t check_sig; + pmsiglevel_t level; /* Sanity checks */ ASSERT(db != NULL, return -1); @@ -170,7 +170,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) if(!syncpath) { return -1; } - check_sig = _alpm_db_get_sigverify_level(db); + level = alpm_db_get_siglevel(db); for(i = db->servers; i; i = i->next) { const char *server = i->data; @@ -185,8 +185,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) ret = _alpm_download(handle, fileurl, syncpath, force, 0, 0); - if(ret == 0 && (check_sig == PM_PGP_VERIFY_ALWAYS || - check_sig == PM_PGP_VERIFY_OPTIONAL)) { + if(ret == 0 && (level & PM_SIG_DATABASE)) { /* an existing sig file is no good at this point */ char *sigpath = _alpm_db_sig_path(db); if(!sigpath) { @@ -196,7 +195,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) unlink(sigpath); free(sigpath); - int errors_ok = (check_sig == PM_PGP_VERIFY_OPTIONAL); + int errors_ok = (level & PM_SIG_DATABASE_OPTIONAL); /* if we downloaded a DB, we want the .sig from the same server */ snprintf(fileurl, len, "%s/%s.db.sig", server, db->treename); @@ -579,7 +578,7 @@ struct db_operations sync_db_ops = { }; pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename, - pgp_verify_t level) + pmsiglevel_t level) { pmdb_t *db; @@ -591,7 +590,7 @@ pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename, } db->ops = &sync_db_ops; db->handle = handle; - db->pgp_verify = level; + db->siglevel = level; sync_db_validate(db); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 55c5bd4..37a2a6d 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -46,7 +46,7 @@ /** Register a sync database of packages. */ pmdb_t SYMEXPORT *alpm_db_register_sync(pmhandle_t *handle, const char *treename, - pgp_verify_t check_sig) + pmsiglevel_t level) { /* Sanity checks */ CHECK_HANDLE(handle, return NULL); @@ -55,7 +55,7 @@ pmdb_t SYMEXPORT *alpm_db_register_sync(pmhandle_t *handle, const char *treename /* Do not register a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(handle, PM_ERR_TRANS_NOT_NULL, NULL)); - return _alpm_db_register_sync(handle, treename, check_sig); + return _alpm_db_register_sync(handle, treename, level); } /* Helper function for alpm_db_unregister{_all} */ @@ -211,23 +211,6 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url) return 1; } -/** Set the verify gpg signature option for a database. - * @param db database pointer - * @param verify enum pgp_verify_t - * @return 0 on success, -1 on error (pm_errno is set accordingly) - */ -int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) -{ - /* Sanity checks */ - ASSERT(db != NULL, return -1); - db->handle->pm_errno = 0; - - db->pgp_verify = verify; - _alpm_log(db->handle, PM_LOG_DEBUG, "adding VerifySig option to database '%s': %d\n", - db->treename, verify); - - return 0; -} /** Get the name of a package database. */ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) @@ -236,6 +219,16 @@ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) return db->treename; } +/** Get the signature verification level for a database. */ +pmsiglevel_t SYMEXPORT alpm_db_get_siglevel(pmdb_t *db) +{ + if(db->siglevel & PM_SIG_USE_DEFAULT) { + return alpm_option_get_default_siglevel(db->handle); + } else { + return db->siglevel; + } +} + /** Check the validity of a database. */ int SYMEXPORT alpm_db_valid(pmdb_t *db) { @@ -329,7 +322,7 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(pmdb_t), return NULL); STRDUP(db->treename, treename, return NULL); db->is_local = is_local; - db->pgp_verify = PM_PGP_VERIFY_UNKNOWN; + db->siglevel = 0; return db; } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5e9c9c1..af57b87 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -63,7 +63,7 @@ struct __pmdb_t { pmpkghash_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; - pgp_verify_t pgp_verify; + pmsiglevel_t siglevel; struct db_operations *ops; }; @@ -78,7 +78,7 @@ int _alpm_db_cmp(const void *d1, const void *d2); alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(pmhandle_t *handle); pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename, - pgp_verify_t level); + pmsiglevel_t level); void _alpm_db_unregister(pmdb_t *db); /* be_*.c, backend specific calls */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9354562..3a5ceb7 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -353,11 +353,10 @@ char SYMEXPORT *alpm_fetch_pkgurl(pmhandle_t *handle, const char *url) _alpm_log(handle, PM_LOG_DEBUG, "successfully downloaded %s\n", url); /* attempt to download the signature */ - if(ret == 0 && (handle->sigverify == PM_PGP_VERIFY_ALWAYS || - handle->sigverify == PM_PGP_VERIFY_OPTIONAL)) { + if(ret == 0 && (handle->siglevel & PM_SIG_PACKAGE)) { char *sig_url; size_t len; - int errors_ok = (handle->sigverify == PM_PGP_VERIFY_OPTIONAL); + int errors_ok = (handle->siglevel & PM_SIG_PACKAGE_OPTIONAL); len = strlen(url) + 5; CALLOC(sig_url, len, sizeof(char), RET_ERR(handle, PM_ERR_MEMORY, NULL)); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index d2bb4f6..8cb8c08 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -43,7 +43,8 @@ pmhandle_t *_alpm_handle_new() CALLOC(handle, 1, sizeof(pmhandle_t), return NULL); - handle->sigverify = PM_PGP_VERIFY_OPTIONAL; + handle->siglevel = PM_SIG_PACKAGE | PM_SIG_PACKAGE_OPTIONAL | + PM_SIG_DATABASE | PM_SIG_DATABASE_OPTIONAL; return handle; } @@ -520,18 +521,17 @@ int SYMEXPORT alpm_option_set_checkspace(pmhandle_t *handle, int checkspace) return 0; } -int SYMEXPORT alpm_option_set_default_sigverify(pmhandle_t *handle, pgp_verify_t level) +int SYMEXPORT alpm_option_set_default_siglevel(pmhandle_t *handle, pmsiglevel_t level) { CHECK_HANDLE(handle, return -1); - ASSERT(level != PM_PGP_VERIFY_UNKNOWN, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); - handle->sigverify = level; + handle->siglevel = level; return 0; } -pgp_verify_t SYMEXPORT alpm_option_get_default_sigverify(pmhandle_t *handle) +pmsiglevel_t SYMEXPORT alpm_option_get_default_siglevel(pmhandle_t *handle) { - CHECK_HANDLE(handle, return PM_PGP_VERIFY_UNKNOWN); - return handle->sigverify; + CHECK_HANDLE(handle, return -1); + return handle->siglevel; } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index bace805..1f81c74 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -69,7 +69,7 @@ struct __pmhandle_t { char *arch; /* Architecture of packages we should allow */ int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ - pgp_verify_t sigverify; /* Default signature verification level */ + pmsiglevel_t siglevel; /* Default signature verification level */ /* error code */ enum _pmerrno_t pm_errno; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index bc5b267..19b958f 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -144,7 +144,7 @@ void _alpm_pkg_free_trans(pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, int full, const char *md5sum, const char *base64_sig, - pgp_verify_t check_sig); + pmsiglevel_t level); int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 11886ec..2765756 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -358,21 +358,6 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, #endif /** - * Determines the necessity of checking for a valid PGP signature - * @param db the sync database to query - * - * @return signature verification level - */ -pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) -{ - if(db->pgp_verify != PM_PGP_VERIFY_UNKNOWN) { - return db->pgp_verify; - } else { - return alpm_option_get_default_sigverify(db->handle); - } -} - -/** * Check the PGP signature for the given package file. * @param pkg the package to check * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index fdf81fc..14b2ad7 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -23,7 +23,6 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, const char *base64_sig); -pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db); #endif /* _ALPM_SIGNING_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 0573573..4a52c5c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -865,7 +865,7 @@ int _alpm_sync_commit(pmhandle_t *handle, alpm_list_t **data) int percent = (current * 100) / numtargs; const char *filename; char *filepath; - pgp_verify_t check_sig; + pmsiglevel_t level; PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent, numtargs, current); @@ -876,7 +876,7 @@ int _alpm_sync_commit(pmhandle_t *handle, alpm_list_t **data) filename = alpm_pkg_get_filename(spkg); filepath = _alpm_filecache_find(handle, filename); pmdb_t *sdb = alpm_pkg_get_db(spkg); - check_sig = _alpm_db_get_sigverify_level(sdb); + level = alpm_db_get_siglevel(sdb); /* load the package file and replace pkgcache entry with it in the target list */ /* TODO: alpm_pkg_get_db() will not work on this target anymore */ @@ -884,7 +884,7 @@ int _alpm_sync_commit(pmhandle_t *handle, alpm_list_t **data) "replacing pkgcache entry with package file for target %s\n", spkg->name); pmpkg_t *pkgfile =_alpm_pkg_load_internal(handle, filepath, 1, spkg->md5sum, - spkg->base64_sig, check_sig); + spkg->base64_sig, level); if(!pkgfile) { errors++; *data = alpm_list_add(*data, strdup(filename)); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 1ea9e11..3ebab43 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -52,7 +52,7 @@ config_t *config_new(void) newconfig->op = PM_OP_MAIN; newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING; newconfig->configfile = strdup(CONFFILE); - newconfig->sigverify = PM_PGP_VERIFY_UNKNOWN; + newconfig->siglevel = PM_SIG_USE_DEFAULT; return newconfig; } @@ -222,17 +222,18 @@ int config_set_arch(const char *arch) return 0; } -static pgp_verify_t option_verifysig(const char *value) +static pmsiglevel_t option_verifysig(const char *value) { - pgp_verify_t level; + pmsiglevel_t level; if(strcmp(value, "Always") == 0) { - level = PM_PGP_VERIFY_ALWAYS; + level = PM_SIG_PACKAGE | PM_SIG_DATABASE; } else if(strcmp(value, "Optional") == 0) { - level = PM_PGP_VERIFY_OPTIONAL; + level = PM_SIG_PACKAGE | PM_SIG_PACKAGE_OPTIONAL | + PM_SIG_DATABASE | PM_SIG_DATABASE_OPTIONAL; } else if(strcmp(value, "Never") == 0) { - level = PM_PGP_VERIFY_NEVER; + level = 0; } else { - level = PM_PGP_VERIFY_UNKNOWN; + return -1; } pm_printf(PM_LOG_DEBUG, "config: VerifySig = %s (%d)\n", value, level); return level; @@ -359,9 +360,9 @@ static int _parse_options(const char *key, char *value, } FREELIST(methods); } else if(strcmp(key, "VerifySig") == 0) { - pgp_verify_t level = option_verifysig(value); - if(level != PM_PGP_VERIFY_UNKNOWN) { - config->sigverify = level; + pmsiglevel_t level = option_verifysig(value); + if(level != -1) { + config->siglevel = level; } else { pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' has invalid value '%s'\n"), @@ -484,8 +485,8 @@ static int setup_libalpm(void) alpm_option_set_cachedirs(handle, config->cachedirs); } - if(config->sigverify != PM_PGP_VERIFY_UNKNOWN) { - alpm_option_set_default_sigverify(handle, config->sigverify); + if(config->siglevel != PM_SIG_USE_DEFAULT) { + alpm_option_set_default_siglevel(handle, config->siglevel); } if(config->xfercommand) { @@ -518,7 +519,7 @@ struct section_t { char *name; int is_options; /* db section option gathering */ - pgp_verify_t sigverify; + pmsiglevel_t siglevel; alpm_list_t *servers; }; @@ -545,7 +546,7 @@ static int finish_section(struct section_t *section, int parse_options) } /* if we are not looking at options sections only, register a db */ - db = alpm_db_register_sync(config->handle, section->name, section->sigverify); + db = alpm_db_register_sync(config->handle, section->name, section->siglevel); if(db == NULL) { pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"), section->name, alpm_strerror(alpm_errno(config->handle))); @@ -568,7 +569,7 @@ static int finish_section(struct section_t *section, int parse_options) cleanup: alpm_list_free(section->servers); section->servers = NULL; - section->sigverify = 0; + section->siglevel = PM_SIG_USE_DEFAULT; free(section->name); section->name = NULL; return ret; @@ -726,9 +727,9 @@ static int _parseconfig(const char *file, struct section_t *section, } section->servers = alpm_list_add(section->servers, strdup(value)); } else if(strcmp(key, "VerifySig") == 0) { - pgp_verify_t level = option_verifysig(value); - if(level != PM_PGP_VERIFY_UNKNOWN) { - section->sigverify = level; + pmsiglevel_t level = option_verifysig(value); + if(level != -1) { + section->siglevel = level; } else { pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' has invalid value '%s'\n"), @@ -763,6 +764,7 @@ int parseconfig(const char *file) int ret; struct section_t section; memset(&section, 0, sizeof(struct section_t)); + section.siglevel = PM_SIG_USE_DEFAULT; /* the config parse is a two-pass affair. We first parse the entire thing for * the [options] section so we can get all default and path options set. * Next, we go back and parse everything but [options]. */ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 4c44bfd..5e1a5b1 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -71,7 +71,7 @@ typedef struct __config_t { unsigned short noask; unsigned int ask; pmtransflag_t flags; - pgp_verify_t sigverify; + pmsiglevel_t siglevel; /* conf file options */ /* I Love Candy! */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 38b3752..6b0011c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -549,7 +549,7 @@ int pacman_query(alpm_list_t *targets) char *strname = alpm_list_getdata(i); if(config->op_q_isfile) { - alpm_pkg_load(config->handle, strname, 1, PM_PGP_VERIFY_NEVER, &pkg); + alpm_pkg_load(config->handle, strname, 1, 0, &pkg); } else { pkg = alpm_db_get_pkg(db_local, strname); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 539e651..24e5b24 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -220,7 +220,7 @@ static int sync_cleancache(int level) /* attempt to load the package, prompt removal on failures as we may have * files here that aren't valid packages. we also don't need a full * load of the package, just the metadata. */ - if(alpm_pkg_load(config->handle, path, 0, PM_PGP_VERIFY_NEVER, &localpkg) != 0 + if(alpm_pkg_load(config->handle, path, 0, 0, &localpkg) != 0 || localpkg == NULL) { if(yesno(_("File %s does not seem to be a valid package, remove it?"), path)) { diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 35624eb..a08a9d6 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -42,7 +42,7 @@ int pacman_upgrade(alpm_list_t *targets) { alpm_list_t *i, *data = NULL; - pgp_verify_t check_sig = alpm_option_get_default_sigverify(config->handle); + pmsiglevel_t level = alpm_option_get_default_siglevel(config->handle); int retval = 0; if(targets == NULL) { @@ -76,7 +76,7 @@ int pacman_upgrade(alpm_list_t *targets) char *targ = alpm_list_getdata(i); pmpkg_t *pkg; - if(alpm_pkg_load(config->handle, targ, 1, check_sig, &pkg) != 0) { + if(alpm_pkg_load(config->handle, targ, 1, level, &pkg) != 0) { pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ, alpm_strerror(alpm_errno(config->handle))); trans_release(); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 5ee59db..3809525 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -71,11 +71,12 @@ static void checkdbs(const char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; pmdb_t *db = NULL; alpm_list_t *i; + const pmsiglevel_t level = PM_SIG_DATABASE | PM_SIG_DATABASE_OPTIONAL; for(i = dbnames; i; i = alpm_list_next(i)) { char *dbname = alpm_list_getdata(i); snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname); - db = alpm_db_register_sync(handle, dbname, PM_PGP_VERIFY_OPTIONAL); + db = alpm_db_register_sync(handle, dbname, level); if(db == NULL) { fprintf(stderr, "error: could not register sync database (%s)\n", alpm_strerror(alpm_errno(handle))); diff --git a/src/util/testdb.c b/src/util/testdb.c index f45b4a9..54a7040 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -149,10 +149,11 @@ static int check_syncdbs(alpm_list_t *dbnames) { int ret = 0; pmdb_t *db = NULL; alpm_list_t *i, *pkglist, *syncpkglist = NULL; + const pmsiglevel_t level = PM_SIG_DATABASE | PM_SIG_DATABASE_OPTIONAL; for(i = dbnames; i; i = alpm_list_next(i)) { char *dbname = alpm_list_getdata(i); - db = alpm_db_register_sync(handle, dbname, PM_PGP_VERIFY_OPTIONAL); + db = alpm_db_register_sync(handle, dbname, level); if(db == NULL) { fprintf(stderr, "error: could not register sync database (%s)\n", alpm_strerror(alpm_errno(handle))); diff --git a/src/util/testpkg.c b/src/util/testpkg.c index c6f02e3..29effd9 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -43,6 +43,7 @@ int main(int argc, char *argv[]) pmhandle_t *handle; enum _pmerrno_t err; pmpkg_t *pkg = NULL; + const pmsiglevel_t level = PM_SIG_PACKAGE | PM_SIG_PACKAGE_OPTIONAL; if(argc != 2) { fprintf(stderr, "usage: %s <package file>\n", BASENAME); @@ -58,7 +59,7 @@ int main(int argc, char *argv[]) /* let us get log messages from libalpm */ alpm_option_set_logcb(handle, output_cb); - if(alpm_pkg_load(handle, argv[1], 1, PM_PGP_VERIFY_OPTIONAL, &pkg) == -1 + if(alpm_pkg_load(handle, argv[1], 1, level, &pkg) == -1 || pkg == NULL) { enum _pmerrno_t err = alpm_errno(handle); switch(err) { -- 1.7.5.4

2 1

[pacman-dev] [PATCH] WIP: makepkg: rework libprovides
by Allan McRae 16 Jun '11

16 Jun '11

This reworks the implmentation of libprovides for the following benefits: - Moves functionality from write_pkginfo() to find_libprovides() - Only calculates the version for libraries specifically requested and not all libraries. This has the disadvantage of running find over the $pkgdir for as many libraries as needed, but is unlikely to be an issue due to caching. - The order of the provides array in the PKGBUILD is kept in the package - There are more warning messages when things fail and those that were there are no longer errors (as I do not think failure of libprovides should result in complete packaging failure) - It is now modular so can be easy extended to other library types other than ELF *.so. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I cut and pasted the actual finding of the soarch/soversion etc, but that obviously needs fixed. WTF is the comment "# 64" supposed to mean? I also would like documentation about why we need the [ -z "$sofile" ] test (reminder: needs adjusted to double bracket format). Also, why do we extract "soname" when that should be what was already given in the provides array? scripts/makepkg.sh.in | 83 ++++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 39 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7527329..dae229a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -980,30 +980,47 @@ find_libdepends() { } find_libprovides() { - local libprovides - find "$pkgdir" -type f -name \*.so\* | while read filename - do - # check if we really have a shared object - if LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then - # 64 - soarch=$(LC_ALL=C readelf -h "$filename" | sed -n 's/.*Class.*ELF$32\|64$/\1/p') - # get the string binaries link to: libfoo.so.1.2 -> libfoo.so.1 - sofile=$(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') - [ -z "$sofile" ] && sofile="${$filename##*/}" - - # extract the library name: libfoo.so - soname="${sofile%%\.so\.*}.so" - # extract the major version: 1 - soversion="${sofile##*\.so\.}" - if in_array "${soname}" ${provides[@]}; then - if ! in_array "${soname}=${soversion}-${soarch}" ${libprovides[@]}; then - # libfoo.so=1-64 - echo "${soname}=${soversion}-${soarch}" - libprovides=(${libprovides[@]} "${soname}=${soversion}-${soarch}") + local libprovides missing + for p in ${provides[@]}; do + missing=0 + case "$p" in + *.so) + filename=$(find "$pkgdir" -type f -name $p\*) + if [[ $filename ]]; then + # check if we really have a shared object + if LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then + # 64 + soarch=$(LC_ALL=C readelf -h "$filename" | sed -n 's/.*Class.*ELF$32\|64$/\1/p') + # get the string binaries link to: libfoo.so.1.2 -> libfoo.so.1 + sofile=$(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') + [ -z "$sofile" ] && sofile="${$filename##*/}" + + # extract the library name: libfoo.so + soname="${sofile%%\.so\.*}.so" + # extract the major version: 1 + soversion="${sofile##*\.so\.}" + + libprovides=(${libprovides[@]} "${soname}=${soversion}-${soarch}") + else + warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p" + libprovides=(${libprovides[@]} "$p") + fi + else + libprovides=(${libprovides[@]} "$p") + missing=1 fi - fi - fi + ;; + *) + libprovides=(${libprovides[@]} "$p") + ;; + esac + + if (( missing )); then + warning "$(gettext "Can not find library listed in %s: %s")" "'provides'" "$p" + fi done + + echo ${libprovides[@]} } write_pkginfo() { @@ -1037,13 +1054,15 @@ write_pkginfo() { [[ $groups ]] && printf "group = %s\n" "${groups[@]}" [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}" [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" + + provides=("$(find_libprovides)") + [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" + [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" - local it - libprovides=$(find_libprovides) + local it libdepends=$(find_libdepends) - provides=("${provides[@]}" ${libprovides}) depends=("${depends[@]}" ${libdepends}) for it in "${depends[@]}"; do @@ -1059,20 +1078,6 @@ write_pkginfo() { fi done - for it in "${provides[@]}"; do - # ignore versionless entires (those come from the PKGBUILD) - if [[ $it = *.so ]]; then - # check if the entry has been found by find_libprovides - # if not, it's unneeded; tell the user so he can remove it - if [[ ! $libprovides =~ (^|\s)${it}=.* ]]; then - error "$(gettext "Can not find library listed in %s: %s")" "'provides'" "$it" - return 1 - fi - else - echo "provides = $it" - fi - done - for it in "${packaging_options[@]}"; do local ret="$(check_option $it)" if [[ $ret != "?" ]]; then -- 1.7.5.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-262-gd21f6ca
by dan＠archlinux.org 15 Jun '11

15 Jun '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 d21f6ca4aa3209938fa312f29ac03446f57e6a66 (commit) via 06cb713f3915cc858de0388b0a5232326101a9fa (commit) via e27e658033d500c22b9dd4974fa3fbcc378f35b9 (commit) via 53f4e431918fdfd4e2433c387da1c89c697613bf (commit) via 4272b37d3d9f112b9f089dafc2e7538c4c24f7b2 (commit) via 6f3a2145b0de7f27a1bf5932af3fe0a67171a881 (commit) via 5f404f2cb78f48ddd90be0334fa2528961b17871 (commit) via e92083798cdd98961e0d2befe25af7a8f96c9ab5 (commit) via 5b33f48389531e47a0093e84feedce0f63a94c77 (commit) via 700a5374f1c3ab87a194ad7e5472b72072d04454 (commit) via 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (commit) via 4664a095a497de1b47d980863228860a6d19f286 (commit) via 82a701401cd31621f87956dc60c97ab6fbee4add (commit) via ef3ec2603dcef448399d20f1363b5d34c1443f56 (commit) via 2f5f15727457260179c9328d96b6e2980b097f8c (commit) via 71fd34e59603e95be79ab3399d9968b89f9df396 (commit) via ee015f086f3c40390659bbc0129b7c08ffd0ed5f (commit) via be972767358e6dfbb08686555d8e2c0176a55106 (commit) via 76a991c117f3419e5cd630355b90876084d27c4b (commit) via ba63e31cc7ecc9e7fccb68e9fa4e09c90a8d5c66 (commit) via 0074cadb3bfdf5d89065e69eb93788ebcc9a6b58 (commit) from c206b3a6d503e57691664b94e68ba85760bd0b6c (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 d21f6ca4aa3209938fa312f29ac03446f57e6a66 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 16:02:22 2011 +1000 makepkg: create source package inside fakeroot Create source package files inside the fakeroot environment to ensure reasonable ownership of files within the archive. Fixes FS#24330. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06cb713f3915cc858de0388b0a5232326101a9fa Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 15 13:52:56 2011 +1000 Clean up makefile for script generation We no longer have any python scripts in our scripts/ directory so we can simplify the makefile a bit. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e27e658033d500c22b9dd4974fa3fbcc378f35b9 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 13 22:36:41 2011 +1000 parse_options: adjust error messages Provide consistent error messages for unknown long and short options. Also get full string translation for the messages. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53f4e431918fdfd4e2433c387da1c89c697613bf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 9 21:08:40 2011 +1000 scripts/library: add README file Add a README file to briefly document the code snippets in the scripts library folder. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4272b37d3d9f112b9f089dafc2e7538c4c24f7b2 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 9 20:43:25 2011 +1000 scripts: refactor output formatting functions Move the common output formatting functions into a separate library file and import that into each script. makepkg is excluded due to its additional color formatting. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f3a2145b0de7f27a1bf5932af3fe0a67171a881 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 23:36:46 2011 +1000 makepkg: move option parsing code to separate file This move the getopt replacement function parse_options out of makepkg.sh.in and into a separate file. The code is inserted into the relevant place in makepkg using m4. This will allow the reuse of the option parsing code in other scripts (i.e. pacman-key) while avoiding code duplication. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f404f2cb78f48ddd90be0334fa2528961b17871 Merge: e920837 6eee3f6 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 15 09:16:08 2011 -0500 Merge branch 'maint' commit e92083798cdd98961e0d2befe25af7a8f96c9ab5 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Wed Jun 15 11:04:09 2011 +0200 Ensure humanize_size works for negative values Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5b33f48389531e47a0093e84feedce0f63a94c77 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Wed Jun 15 10:54:38 2011 +0200 Use pm_fprintpf in table_create_format Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 700a5374f1c3ab87a194ad7e5472b72072d04454 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 11 12:00:20 2011 +1000 makepkg: reword purge message Clarfiy that it is unwanted files are being removed rather than "other" files (whatever they are...). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82a701401cd31621f87956dc60c97ab6fbee4add Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 10:31:51 2011 -0500 valgrind.supp: add known leak exposed by cURL This one comes courtesy of OpenSSL and some static initialization. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef3ec2603dcef448399d20f1363b5d34c1443f56 Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Jun 9 23:17:06 2011 +0200 doc/PKGBUILD: misc changes Acked-by: matt mooney <mfm(a)muteddisk.com> Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 2f5f15727457260179c9328d96b6e2980b097f8c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 10:15:43 2011 -0500 Rename and rework signing helper methods * Don't name static methods with a gpgme_ prefix to avoid confusion with methods provided by the library. These are static and local to our file so just give them sane non-prefixed names. * Rework sigsum_test_bit() to not require assignment. * Don't balk if there is more than one signature available (for now, only check the first). * Fix error codes in publicly visible methods to return -1, not 0, if pkg or db are not provided. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 71fd34e59603e95be79ab3399d9968b89f9df396 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 10:09:35 2011 -0500 Alpm pkg accessors: ensure pkg argument is non-NULL Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ee015f086f3c40390659bbc0129b7c08ffd0ed5f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 10:01:08 2011 -0500 Ensure handle is valid and pm_errno is reset when calling into API We didn't do due diligence before and ensure prior pm_errno values weren't influencing what happened in further ALPM calls. I observed one case of early setup code setting pm_errno to PM_ERR_WRONG_ARGS and that flag persisting the entire time we were calling library code. Add a new CHECK_HANDLE() macro that does two things: 1) ensures the handle variable passed to it is non-NULL and 2) clears any existing pm_errno flag set on the handle. This macro can replace many places we used the ASSERT(handle != NULL, ...) pattern before. Several other other places only need a simple 'set to zero' of the pm_errno field. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be972767358e6dfbb08686555d8e2c0176a55106 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 09:32:39 2011 -0500 Avoid setting sigverify option twice Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 76a991c117f3419e5cd630355b90876084d27c4b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 14 09:30:46 2011 -0500 Conflict check and skip_remove code cleanups * Move several variables into better scope * const-ify a few variables * Avoid duplicating filelists if it is unnecessary * Better handling out out of memory condition when adding file conflicts to our list Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ba63e31cc7ecc9e7fccb68e9fa4e09c90a8d5c66 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 9 15:23:24 2011 -0500 Small handle related cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0074cadb3bfdf5d89065e69eb93788ebcc9a6b58 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 9 15:18:47 2011 -0500 Add handle argument to _alpm_pkg_should_ignore() This allows callers to retrieve it from wherever is convenient, which may or may not be on the package object itself. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 7 +- doc/PKGBUILD.5.txt | 26 +++--- lib/libalpm/add.c | 5 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 1 + lib/libalpm/conflict.c | 85 +++++++++++++-------- lib/libalpm/db.c | 20 ++++- lib/libalpm/deps.c | 9 ++- lib/libalpm/dload.c | 2 + lib/libalpm/handle.c | 94 ++++++++++++------------ lib/libalpm/package.c | 74 +++++++++++++++++-- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 12 ++-- lib/libalpm/signing.c | 76 +++++++++--------- lib/libalpm/sync.c | 23 +++--- lib/libalpm/trans.c | 16 ++-- lib/libalpm/util.h | 2 + scripts/Makefile.am | 50 +++++++++---- scripts/library/README | 15 ++++ scripts/library/output_format.sh | 21 +++++ scripts/library/parse_options.sh | 87 +++++++++++++++++++++ scripts/makepkg.sh.in | 155 ++++++++++--------------------------- scripts/pacman-db-upgrade.sh.in | 9 +-- scripts/pacman-key.sh.in | 21 +----- scripts/pkgdelta.sh.in | 16 +---- scripts/repo-add.sh.in | 22 +----- src/pacman/conf.c | 1 - src/pacman/util.c | 6 +- valgrind.supp | 10 +++ 30 files changed, 498 insertions(+), 376 deletions(-) create mode 100644 scripts/library/README create mode 100644 scripts/library/output_format.sh create mode 100644 scripts/library/parse_options.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-5-g6eee3f6
by dan＠archlinux.org 15 Jun '11

15 Jun '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 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (commit) via 4664a095a497de1b47d980863228860a6d19f286 (commit) from 07e97a5f2c1e1039f35a7893d2be6abf07af690a (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 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 15 09:10:33 2011 -0500 list_display: fix incorrect assignment Commit 895a88886525d erroneously left this around. Noticed-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4664a095a497de1b47d980863228860a6d19f286 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 13 21:53:23 2011 +1000 Fix man page generation for out of tree build Fix failure at man page generation when building outside the source tree. There may still be issues with other documentation types... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 7 ++++--- src/pacman/util.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix list_display on non-ttys and other output fixes
by Dan McGee 15 Jun '11

15 Jun '11

commit c1f742d7750a14 broke what was one of the tenants of out output- if piping pacman output somewhere else, we shouldn't ever try to line-wrap and indent print our output. This makes it easier for tools to use output from pacman -Ss, -Qs, -Qi, etc. list_display() unfortunately was given a default value of 80 rather than 0, so fix this. Next, make some additional changes that ensure we don't insert an unnecessary blank line if for some crazy reason the indent level (such as on -Qi output) is greater than the number of columns. Accomplish this by printing the first item unconditionally as we do in list_display_linebreak(). Finally, teach indentprint to not wrap if the number of columns is less than the indent level, this prevents some forms of ridiculous output such as the following: Install Date : Wed 08 Jun 2011 04:39:19 AM CDT Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. Dave, looking forward to your feedback. :) -Dan src/pacman/util.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 508cc89..a6d150f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -216,8 +216,9 @@ void indentprint(const char *str, int indent) return; } - /* if we're not a tty, print without indenting */ - if(cols == 0) { + /* if we're not a tty, or our tty is not wide enough that wrapping even makes + * sense, print without indenting */ + if(cols == 0 || indent > cols) { printf("%s", str); return; } @@ -450,12 +451,16 @@ void list_display(const char *title, const alpm_list_t *list) if(!list) { printf("%s\n", _("None")); } else { - int cols; - const int maxcols = getcols(80); - for(i = list, cols = len; i; i = alpm_list_next(i)) { - char *str = alpm_list_getdata(i); + const int maxcols = getcols(0); + int cols = len; + const char *str = alpm_list_getdata(list); + printf("%s", str); + cols += string_length(str); + for(i = alpm_list_next(list), cols = len; i; i = alpm_list_next(i)) { + const char *str = alpm_list_getdata(i); int s = string_length(str); - if(cols + s + 2 >= maxcols) { + /* wrap only if we have enough usable column space */ + if(maxcols > len && cols + s + 2 >= maxcols) { int j; cols = len; printf("\n"); -- 1.7.5.2

4 4