September 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] pacman-key: document --lsign-key
by Dan McGee 01 Sep '11

01 Sep '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman-key.8.txt | 4 ++++ scripts/pacman-key.sh.in | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 3582b99..4201107 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -77,6 +77,10 @@ Options *--list-sigs* [keyid(s)]:: Same as --list-keys, but the signatures are listed too. +*\--lsign-key* <keyid>:: + Locally sign the given key. This is primarily used to root the web of trust + in the local private key generated by \--init. + *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 14ea07d..b469fd3 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -74,6 +74,7 @@ usage() { echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" + echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")" printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ in '%s'")\n" "@pkgdatadir@/keyrings" } -- 1.7.6

1 1

[pacman-dev] [PATCH] pactest: remove PACMAN_OUTPUT from ldconfig tests
by Dan McGee 01 Sep '11

01 Sep '11

This removes the last usages of this rule that aren't explicitly looking at real output from pacman. Notably, these tests depended on one particular debug logger not ever being changed, which is too fragile, not to mention doesn't work at all with --nolog. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/ldconfig.stub | 4 ++++ test/pacman/pmtest.py | 7 ++++++- test/pacman/tests/ldconfig001.py | 9 +++------ test/pacman/tests/ldconfig002.py | 7 ++----- test/pacman/tests/ldconfig003.py | 7 +------ test/pacman/util.py | 1 + 6 files changed, 17 insertions(+), 18 deletions(-) create mode 100755 test/pacman/ldconfig.stub diff --git a/test/pacman/ldconfig.stub b/test/pacman/ldconfig.stub new file mode 100755 index 0000000..d261a04 --- /dev/null +++ b/test/pacman/ldconfig.stub @@ -0,0 +1,4 @@ +#!/bin/sh +# A simple stub to copy into the chroot to fake ldconfig. +# Simply appends a line to /etc/ld.so.cache if called. +echo "ldconfig called" >> /etc/ld.so.cache diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 3acf5d8..4e1ecd0 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -119,13 +119,18 @@ def generate(self): logdir = os.path.join(self.root, os.path.dirname(util.LOGFILE)) etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF)) bindir = os.path.join(self.root, "bin") - sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir] + sbindir = os.path.join(self.root, "sbin") + sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, sbindir] for sys_dir in sys_dirs: if not os.path.isdir(sys_dir): vprint("\t%s" % sys_dir[len(self.root)+1:]) os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot shutil.copy("/bin/sh", bindir) + shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), + os.path.join(sbindir, "ldconfig")) + ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") + ld_so_conf.close() # Configuration file vprint(" Creating configuration file") diff --git a/test/pacman/tests/ldconfig001.py b/test/pacman/tests/ldconfig001.py index aa029ba..a264326 100644 --- a/test/pacman/tests/ldconfig001.py +++ b/test/pacman/tests/ldconfig001.py @@ -1,12 +1,9 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) -self.description = "Make sure ldconfig runs on an add operation" +self.description = "Make sure ldconfig runs on an upgrade operation" p = pmpkg("dummy") self.addpkg(p) -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -U %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig002.py b/test/pacman/tests/ldconfig002.py index c028ce3..2628dc7 100644 --- a/test/pacman/tests/ldconfig002.py +++ b/test/pacman/tests/ldconfig002.py @@ -1,5 +1,3 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) self.description = "Make sure ldconfig runs on an upgrade operation" lp = pmpkg("dummy") @@ -8,9 +6,8 @@ p = pmpkg("dummy", "1.0-2") self.addpkg(p) -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -U %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig003.py b/test/pacman/tests/ldconfig003.py index 69618c6..8d1babb 100644 --- a/test/pacman/tests/ldconfig003.py +++ b/test/pacman/tests/ldconfig003.py @@ -1,5 +1,3 @@ -# quick note here - chroot() is expected to fail. We're not checking the -# validity of the scripts, only that they fire (or try to) self.description = "Make sure ldconfig runs on a sync operation" sp = pmpkg("dummy") @@ -7,8 +5,5 @@ self.args = "-S %s" % sp.name -# --debug is necessary to check PACMAN_OUTPUT -self.args = "--debug -S %s" % sp.name - self.addrule("PACMAN_RETCODE=0") -self.addrule("PACMAN_OUTPUT=running ldconfig") +self.addrule("FILE_EXIST=/etc/ld.so.cache") diff --git a/test/pacman/util.py b/test/pacman/util.py index cde44c6..81dcc90 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -20,6 +20,7 @@ import re import hashlib +SELFPATH = os.path.abspath(os.path.dirname(__file__)) # ALPM PM_ROOT = "/" -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-144-gad051f7
by dan＠archlinux.org 01 Sep '11

01 Sep '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 ad051f7328cb8fed19070651aac314d64de1b815 (commit) via 13072ef86ca8d9b3eb5b06c21211dc98d5a21732 (commit) via 11873b70ae346d06da8590f6bd4bfc19577a8840 (commit) via 11ab9aa9f5f0f3873df89c73e8715b82f485bd9b (commit) via cf1f0143935fe62ebb568202ff83ba2de0815995 (commit) via 5bb2d2e0a0c9edf03273fc00aa9e3a5cdff13310 (commit) via 35d8cc8bc8ae94fcdde1bc04a3276a73e41660ec (commit) via 50f53b293c0ff823065e7a98d288787ca7bd4ba9 (commit) via 7479bf21e85c118067351769cdc9f1fd589ac4dc (commit) via 06b228b20fff23500e5bb9bc8cdf96a86ca244e8 (commit) via 19c3880ec9e7b373000b10e230217a733d1c1a24 (commit) via 2c5f000d5b2fd5db3b70670b835e6b932c0d10e3 (commit) from 234b6ffc2c39268d1efdc414e02bc4b352e5d931 (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 ad051f7328cb8fed19070651aac314d64de1b815 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 12:36:11 2011 -0500 _alpm_parsedate(): return time_t and not long Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13072ef86ca8d9b3eb5b06c21211dc98d5a21732 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 12:06:32 2011 -0500 Add pactest for overflowing date (year 2038 problem) This will work fine on x86_64 (or any platform that has a 64 bit long), but currently fails on i686. This test also stresses the recent changes to accommodate package size values greater than a 32 bit UINT_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11873b70ae346d06da8590f6bd4bfc19577a8840 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Sep 1 11:42:55 2011 -0500 makepkg: fix overzealous PGP signature file matching The regex wasn't rooted at the end of the filename, nor was it matching a period/dot before the file extension. The end result was this matched a file named '07_all_sig.patch' which is totally broken. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11ab9aa9f5f0f3873df89c73e8715b82f485bd9b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 09:24:28 2011 -0400 pacman/callback: reuse strlen calculation Call strlen earlier in the dl progress callback, and reuse this length to replace some heavier str*() calls with more optimized mem*() replacements. This also gets rid of a false assumption that the ending string will ever be longer than the original string. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cf1f0143935fe62ebb568202ff83ba2de0815995 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 11:01:37 2011 -0400 makepkg: fix sanity checking in versioning Read the entire variable, respecting escapes, which are necessary to retain for the successive eval. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5bb2d2e0a0c9edf03273fc00aa9e3a5cdff13310 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 30 10:31:49 2011 -0400 makepkg: read filenames in a while loop Further improvments on 2ca27ab which will allow the changelog and install script files to contain whitespace. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35d8cc8bc8ae94fcdde1bc04a3276a73e41660ec Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 22 20:50:17 2011 -0400 makepkg: fix breakage in eval'ing quoted strings Broken in 2ca27a by me, trying to fix another problem. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 50f53b293c0ff823065e7a98d288787ca7bd4ba9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 12:52:51 2011 -0500 pacman-key: add --lsign-key operation This allows local signing of a given key to help establish the web of trust rooted at the generated (or imported) master key. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7479bf21e85c118067351769cdc9f1fd589ac4dc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 18:39:11 2011 -0500 pacman-key master key generation This enables pacman-key, during --init, to generate a single secret key for the pacman keyring if one is not present. This will be used as the root of the web of trust for those that do not wish to manage it with their own key, as will be the default. This does not preclude later adding other secret keys to the keyring, or removing this one- we simply ensure you have at least one secret key available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06b228b20fff23500e5bb9bc8cdf96a86ca244e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 16:27:00 2011 -0500 Scale package integrity progress bar/percentage by package size This upgrades the simple 15/17 scaling by package number we used before to package sized based scaling, which is much more accurate. Addresses some of the issues raised in FS#25817. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19c3880ec9e7b373000b10e230217a733d1c1a24 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 30 22:01:13 2011 +1000 Remove outdated comment for _alpm_outerconflicts Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c5f000d5b2fd5db3b70670b835e6b932c0d10e3 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Aug 30 00:58:48 2011 +0800 Improve advice for sync ops when db.lck is present When the database is locked, sync operations involving transactions, such as pacman -Syy, show the following: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck Which is much more meaningful, since the presence of db.lck may indicate an erroneous lockfile instead of an ongoing transaction. Improve the error messages for sync operations by advising the user to remove db.lck if he is sure that no package manager is running. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/conflict.c | 5 +--- lib/libalpm/sync.c | 19 ++++++++++++++++- lib/libalpm/util.c | 4 +- lib/libalpm/util.h | 2 +- scripts/makepkg.sh.in | 30 +++++++++++++--------------- scripts/pacman-key.sh.in | 42 ++++++++++++++++++++++++++++++++++++++-- src/pacman/callback.c | 23 ++++++++++++--------- src/pacman/sync.c | 1 + src/pacman/util.c | 22 ++++++++++++-------- src/pacman/util.h | 1 + test/pacman/tests/query002.py | 4 +- test/pacman/tests/query005.py | 4 +- test/pacman/tests/query006.py | 27 ++++++++++++++++++++++++++ 13 files changed, 133 insertions(+), 51 deletions(-) create mode 100644 test/pacman/tests/query006.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Add pactest for overflowing date (year 2038 problem)
by Dan McGee 01 Sep '11

01 Sep '11

This will work fine on x86_64 (or any platform that has a 64 bit long), but currently fails on i686. This test also stresses the recent changes to accommodate package size values greater than a 32 bit UINT_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/query002.py | 4 ++-- test/pacman/tests/query005.py | 4 ++-- test/pacman/tests/query006.py | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/query006.py diff --git a/test/pacman/tests/query002.py b/test/pacman/tests/query002.py index 72fd7c1..ccf18f4 100644 --- a/test/pacman/tests/query002.py +++ b/test/pacman/tests/query002.py @@ -1,4 +1,4 @@ -self.description = "Query info on a package" +self.description = "Query info on a package (old date)" p = pmpkg("foobar") p.files = ["bin/foobar"] @@ -18,4 +18,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.*2007") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2007") diff --git a/test/pacman/tests/query005.py b/test/pacman/tests/query005.py index 23a78fc..06768b3 100644 --- a/test/pacman/tests/query005.py +++ b/test/pacman/tests/query005.py @@ -1,4 +1,4 @@ -self.description = "Query info on a package" +self.description = "Query info on a package (new date)" p = pmpkg("foobar") p.files = ["bin/foobar"] @@ -18,4 +18,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.*2007") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2007") diff --git a/test/pacman/tests/query006.py b/test/pacman/tests/query006.py new file mode 100644 index 0000000..3668478 --- /dev/null +++ b/test/pacman/tests/query006.py @@ -0,0 +1,27 @@ +self.description = "Query info on a package (overflow long values)" + +p = pmpkg("overflow") +p.desc = "Overflow size and date values if possible" +p.url = "http://www.archlinux.org" +p.license = "GPL2" +p.arch = "i686" +p.packager = "Arch Linux" +# size is greater than 4294967295, aka UINT_MAX +p.size = "10000000000" +# build date is greater than 2147483647, aka INT_MAX +p.builddate = "3000000000" +# install date is greater than UINT_MAX +p.installdate = "10000000000" + +self.addpkg2db("local", p) + +self.args = "-Qi %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) +self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) +self.addrule("PACMAN_OUTPUT=^Installed Size.*9765625.00 KiB") +self.addrule("PACMAN_OUTPUT=^Build Date.* 2065") +self.addrule("PACMAN_OUTPUT=^Install Date.* 2286") + +self.expectfailure = True -- 1.7.6

1 1

[pacman-dev] [PATCH] makepkg: fix overzealous PGP signature file matching
by Dan McGee 01 Sep '11

01 Sep '11

The regex wasn't rooted at the end of the filename, nor was it matching a period/dot before the file extension. The end result was this matched a file named '07_all_sig.patch' which is totally broken. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e74e5c8..2f06b9b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -341,7 +341,7 @@ in_array() { source_has_signatures(){ local file for file in "${source[@]}"; do - if [[ $file =~ .*(sig|asc) ]]; then + if [[ $file =~ \.(sig|asc)$ ]]; then return 0 fi done @@ -709,7 +709,7 @@ check_pgpsigs() { for file in "${source[@]}"; do file="$(get_filename "$file")" - if [[ ! $file =~ .*(sig|asc) ]]; then + if [[ ! $file =~ \.(sig|asc)$ ]]; then continue fi -- 1.7.6

1 0