- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-73-g1a994bf
by dan＠archlinux.org 07 Nov '11

07 Nov '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 1a994bf180003b814b135a5acd6f3e2aa67121fc (commit) via e7b56f48d704f57f023d7ca3cdc9d492fb31a9cb (commit) via 601c808b8d3d4eec76b215e56f1d56f4fe591367 (commit) via 1953fe43689054aded03eb166f4f987e7cc0dccd (commit) from 90477f156c18659eee6e8be75122169060309990 (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 1a994bf180003b814b135a5acd6f3e2aa67121fc Merge: 90477f1 e7b56f4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 7 09:16:10 2011 -0600 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 4 ++-- src/pacman/callback.c | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-35-ge7b56f4
by dan＠archlinux.org 07 Nov '11

07 Nov '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 e7b56f48d704f57f023d7ca3cdc9d492fb31a9cb (commit) via 601c808b8d3d4eec76b215e56f1d56f4fe591367 (commit) via 1953fe43689054aded03eb166f4f987e7cc0dccd (commit) from d98ff04cc933253b7221fc170813f7d2365d3289 (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 e7b56f48d704f57f023d7ca3cdc9d492fb31a9cb Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 7 14:47:58 2011 +1000 makepkg: handle pgp signatures with .sign extension Detached sgnature files with extension .sign are accepted by gnupg. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 601c808b8d3d4eec76b215e56f1d56f4fe591367 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 3 09:54:33 2011 -0500 Fix download progress rounding edge case Allan's original message: Occasionally when the download rate showed 100.0 the output got messed up. This was caused by the rounding of a number between 99.95 and 100. Adjust the threshold to avoid this rounding issue. Dan: make this fix, but also show values between 0 and 9.995 with two decimal places since we have the room. Original-fix-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1953fe43689054aded03eb166f4f987e7cc0dccd Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 1 19:17:26 2011 -0500 Fix thinko in _alpm_strip_newline The point of this early compare to NULL byte check was so we could bail early and skip the strcmp() call. Given we weren't doing the check right, this never exited early. Fix it to work as intended. Noticed-by: Pepe Juárez <trulustapa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 4 ++-- src/pacman/callback.c | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Proposal: Add some kind of user feedback about package signing
by robert evert 07 Nov '11

07 Nov '11

Hey, I know that package signing is not a favorite topic, but as its implemented, the world should know, which packages are signed for the time where unsigned and signed packages reside next to each other. Maybe also more people will "complain" to the devs about not-yet signed packages. This fancy one-liner is just an idea, maybe the printf should go to the place, where pacman checks, if the package has a signature and complain there. Or while installing packages, a little * could appear for signed packages. Ideas? -robert >From 648c0ecf65d3cc34559fecbb93b67d572fb1f9c5 Mon Sep 17 00:00:00 2001 From: robert <r.evert_AT_tu-bs.de> Date: Tue, 1 Nov 2011 20:41:25 +0100 Subject: [PATCH] - Add some kind of user feedback about package signing --- lib/libalpm/signing.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 92f34b5..9928fc0 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -665,6 +665,7 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, switch(siglist->results[num].validity) { case ALPM_SIGVALIDITY_FULL: _alpm_log(handle, ALPM_LOG_DEBUG, "signature is fully trusted\n"); + printf(_("Package signature for %s is valid.\n"), path); break; case ALPM_SIGVALIDITY_MARGINAL: _alpm_log(handle, ALPM_LOG_DEBUG, "signature is marginal trust\n");

3 3

[pacman-dev] [PATCH] makepkg: handle pgp signatures with .sign extension
by Allan McRae 07 Nov '11

07 Nov '11

Detached sgnature files with extension .sign are accepted by gnupg. Signed-off-by: Allan McRae <allan(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 3085bf5..5d048d2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -334,7 +334,7 @@ in_array() { source_has_signatures(){ local file for file in "${source[@]}"; do - if [[ $file = *.@(sig|asc) ]]; then + if [[ $file = *.@(sig?(n)|asc) ]]; then return 0 fi done @@ -704,7 +704,7 @@ check_pgpsigs() { for file in "${source[@]}"; do file="$(get_filename "$file")" - if [[ ! $file = *.@(sig|asc) ]]; then + if [[ ! $file = *.@(sig?(n)|asc) ]]; then continue fi -- 1.7.7.2

1 0

[pacman-dev] Split debug support
by Martin Stolpe 04 Nov '11

04 Nov '11

Hello, I'm interested in the split debug support for makepkg. There seems to be some patches floating around: http://mailman.archlinux.org/pipermail/pacman- dev/2011-August/014203.html but they don't seem ready to be accepted. I have quite a few questions on my mind, hopefully somebody can answer them: -What are the requirements for implementing split packages? -Does anybody know how this is handled in other distros? -Why shouldn't the implementation use linux specific tools? -In reference to the previos question: Would it be possible to make this a linux only option? -Is makepkg only used in Archlinux and its dervatives? Regards Martin

1 0

[pacman-dev] [PATCH] Fix speed output edge case
by Allan McRae 03 Nov '11

03 Nov '11

Occasionally when the download rate showed 100.0 the output got messed up. This was caused by the rounding of a number between 99.95 and 100. Adjust the threshold to avoid this rounding issue. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 5d7aed3..03d6266 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -698,11 +698,8 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) printf(" %ls%-*s ", wcfname, padwid, ""); /* We will show 1.6M/s, 11.6M/s, but 116K/s and 1116K/s */ - if(rate_human < 9.95) { - printf("%6.1f %3s %1.2f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); - } else if(rate_human < 99.95) { - printf("%6.1f %3s %2.1f%c/s ", + if(rate_human < 99.95) { + printf("%6.1f %3s %4.1f%c/s ", xfered_human, xfered_label, rate_human, rate_label[0]); } else { printf("%6.1f %3s %4.f%c/s ", -- 1.7.7.2

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-69-g90477f1
by dan＠archlinux.org 01 Nov '11

01 Nov '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 90477f156c18659eee6e8be75122169060309990 (commit) via 8b3717ef0d55719337b061b761979a5fd9b48fbc (commit) via 6df558177fac6bdcbd60de05038d6e6b7f224bd3 (commit) via ed3cd7573600bf8be2bda01ad75da8bae2f589fb (commit) via ba7a056d586f78954ac874a3bebc6325f7e6eeb1 (commit) via a4ce3edf95f148bc6eac16b6edd9bc281c7745af (commit) via d98ff04cc933253b7221fc170813f7d2365d3289 (commit) via 4c259d51f7e0d5fac0158f70b0ad3b0043930943 (commit) via f4875fab9bbe3011446032bebcbe232448a3e8d7 (commit) via 3343185473c79d556b29bda30c9c482c7fef5289 (commit) via 1052709921da50ec5203efaa313dbda75625a4e1 (commit) via 24881034f62cecb9e601fdfee9458f34f32b2507 (commit) via 8a9ce12a27970beb644952a83d27f54d1d7f751a (commit) via 5c1885b55eae870a10c91793d05a74d74a075e83 (commit) via 7a6b01d46c1da385dd34466e757beafa33e02afa (commit) via d5f0395dc13fb305e75a5e78de57e148d87f12d7 (commit) from a708e7d28e890c3e230a215629b7f5c58c57f58d (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 90477f156c18659eee6e8be75122169060309990 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 27 17:23:12 2011 -0500 libalpm/util: don't use sprintf to convert from bin to hex This is a trivial operation that doesn't require calling a function over and over- just do some math and indexing into a character array. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8b3717ef0d55719337b061b761979a5fd9b48fbc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 27 17:18:28 2011 -0500 Fix size reported in CALLOC allocation failure message Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6df558177fac6bdcbd60de05038d6e6b7f224bd3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 26 15:51:46 2011 -0500 Convert package and database archive reads to use file descriptors This gives us a bit more control and over the archive reading process, and a bit less is done behind the scenes. It also allows us to use fstat() in preference to stat(), which should avoid some potential race conditions. Some reorganization is necessary to move the stat calls after the open() calls. Error handling and cleanup in general is also improved, as we had several potential memory and file handle leaks before in some error paths. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed3cd7573600bf8be2bda01ad75da8bae2f589fb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 27 16:24:30 2011 -0500 libalpm/util: use low-level I/O for copyfile and checksum routines This removes an unnecessary level of buffering. We are not doing line-based I/O here, so we can read in blocks of 8K at a time directly from the file. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ba7a056d586f78954ac874a3bebc6325f7e6eeb1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 27 15:47:18 2011 -0500 Add OPEN() and CLOSE() util macros These wrap the normal open() and close() low-level I/O calls and ensure EINTR is handled correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4ce3edf95f148bc6eac16b6edd9bc281c7745af Merge: d5f0395 d98ff04 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 1 10:26:45 2011 -0500 Merge branch 'maint' commit d5f0395dc13fb305e75a5e78de57e148d87f12d7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 26 14:55:50 2011 -0500 libalpm/util: two stat() related cleanups First, use fstat() in preference to stat() since we already have an open file handle. This also removes the need to check for a symlink as that is not possible when a file is opened. Next, use archive_entry_mode() rather than archive_entry_stat() as we only use the mode portion of the stat struct and the call is much cheaper. Also delay it until it is necessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 3 + lib/libalpm/add.c | 17 ++-- lib/libalpm/be_package.c | 72 ++++++++----- lib/libalpm/be_sync.c | 56 ++++++---- lib/libalpm/conflict.c | 33 ++++--- lib/libalpm/dload.c | 16 +++- lib/libalpm/util.c | 199 +++++++++++++++++----------------- lib/libalpm/util.h | 21 ++++- src/pacman/conf.c | 5 +- src/util/Makefile.am | 2 +- test/pacman/tests/fileconflict007.py | 2 +- test/pacman/tests/symlink010.py | 24 ++++ test/pacman/tests/symlink011.py | 24 ++++ test/pacman/tests/symlink012.py | 24 ++++ 14 files changed, 316 insertions(+), 182 deletions(-) create mode 100644 test/pacman/tests/symlink010.py create mode 100644 test/pacman/tests/symlink011.py create mode 100644 test/pacman/tests/symlink012.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-32-gd98ff04
by dan＠archlinux.org 01 Nov '11

01 Nov '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 d98ff04cc933253b7221fc170813f7d2365d3289 (commit) via 4c259d51f7e0d5fac0158f70b0ad3b0043930943 (commit) via f4875fab9bbe3011446032bebcbe232448a3e8d7 (commit) from 3343185473c79d556b29bda30c9c482c7fef5289 (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 d98ff04cc933253b7221fc170813f7d2365d3289 Author: Dave Reisner <d(a)falconindy.com> Date: Sun Oct 30 10:14:37 2011 -0400 src/util: link vercmp against .lo, not the .o This seems to fix FS#26652. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c259d51f7e0d5fac0158f70b0ad3b0043930943 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 22 13:16:39 2011 -0400 dload: remove redundant conditional Replacing the strdup when after the first NULL check assures that we get continue with payload->remote_name defined. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit f4875fab9bbe3011446032bebcbe232448a3e8d7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 17 09:47:06 2011 -0400 dload: chmod tempfiles to respect umask Dan: fix mask calculation, add it to the success/fail block instead. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 18 +++++++++++++++--- src/util/Makefile.am | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] src/util: link vercmp against .lo, not the .o
by Dave Reisner 01 Nov '11

01 Nov '11

This seems to fix FS#26652. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I'm no libtool expert, but this seems to fix the build with --disable-static and the dependencies still look correct for vercmp. src/util/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 11308fb..e4af56c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -31,6 +31,6 @@ testpkg_SOURCES = testpkg.c testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_builddir)/lib/libalpm/version.o +vercmp_LDADD = $(top_builddir)/lib/libalpm/version.lo # vim:set ts=2 sw=2 noet: -- 1.7.7.1

2 1

[pacman-dev] [PATCH] libalpm/util: don't use sprintf to convert from bin to hex
by Dan McGee 27 Oct '11

27 Oct '11

This is a trivial operation that doesn't require calling a function over and over- just do some math and indexing into a character array. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5056b98..57869d3 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -816,6 +816,8 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif +static const char *hex_digits = "0123456789abcdef"; + /** Get the md5 sum of file. * @param filename name of the file * @return the checksum on success, NULL on error @@ -829,8 +831,7 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) ASSERT(filename != NULL, return NULL); - /* allocate 32 chars plus 1 for null */ - CALLOC(md5sum, 33, sizeof(char), return NULL); + MALLOC(md5sum, (size_t)33, return NULL); /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); @@ -841,10 +842,12 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) /* Convert the result to something readable */ for (i = 0; i < 16; i++) { - /* sprintf is acceptable here because we know our output */ - sprintf(md5sum +(i * 2), "%02x", output[i]); + int pos = i * 2; + /* high 4 bits are first digit, low 4 are second */ + md5sum[pos] = hex_digits[output[i] >> 4]; + md5sum[pos + 1] = hex_digits[output[i] & 0x0f]; } - + md5sum[32] = '\0'; return md5sum; } @@ -861,8 +864,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) ASSERT(filename != NULL, return NULL); - /* allocate 64 chars plus 1 for null */ - CALLOC(sha256sum, 65, sizeof(char), return NULL); + MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); @@ -873,10 +875,12 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) /* Convert the result to something readable */ for (i = 0; i < 32; i++) { - /* sprintf is acceptable here because we know our output */ - sprintf(sha256sum +(i * 2), "%02x", output[i]); + int pos = i * 2; + /* high 4 bits are first digit, low 4 are second */ + sha256sum[pos] = hex_digits[output[i] >> 4]; + sha256sum[pos + 1] = hex_digits[output[i] & 0x0f]; } - + sha256sum[64] = '\0'; return sha256sum; } -- 1.7.7

1 0