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

[pacman-dev] [PATCH] pacsysclean: Add new contrib script
by Eric Bélanger 17 Nov '11

17 Nov '11

pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dave as I reused the size_to_human function from his paccache script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- If you can think of a better name, feel free to suggest one. --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/pacsysclean.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 1bd145f..19b81e0 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -6,5 +6,6 @@ paclist paclog-pkglist pacscripts pacsearch +pacsysclean wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 10b03a2..754096d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,8 @@ OURSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ - pacsearch + pacsearch \ + pacsysclean OURFILES = \ bash_completion \ @@ -21,6 +22,7 @@ EXTRA_DIST = \ paclist.in \ pacscripts.in \ pacsearch.in \ + pacsysclean.in \ vimprojects \ zsh_completion.in \ README @@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in +pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in zsh_completion: $(srcdir)/zsh_completion.in diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in new file mode 100755 index 0000000..e393e24 --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,87 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# +# Copyright (C) 2011 Eric Bélanger <eric(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' + +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +usage() { + echo "$0 - Sort installed packages by decreasing installed size." + echo + echo "Usage: $0 [options]" + echo + echo "Options:" + echo " -a List all packages (Default)" + echo " -e List unrequired explicitely installed packages" + echo " -h, --help Show this help message and exit" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +PACMAN_OPTS="-Qq" +if [ -n "$1" ]; then + case "$1" in + -a) PACMAN_OPTS="-Qq" ;; + -e) PACMAN_OPTS="-Qetq" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +TEMPDIR=$(mktemp -d /tmp/cleanup-script.XXXX) +cd $TEMPDIR + +# Sort installed packages by decreasing installed size. Useful for system clean-up. +for package in $(pacman $PACMAN_OPTS); do + echo $(pacman -Qi $package |grep 'Installed Size' |awk '{print $4}') $package +done | sort -g -r -o raw.txt + +N=0 +while read LINE ; do + N=$((N+1)) + size_to_human $(echo -n $LINE |cut -d' ' -f1) >> sorted-list.txt + echo -n ' : ' >> sorted-list.txt + echo -n $LINE |cut -d' ' -f2 >> sorted-list.txt +done < raw.txt + +echo "Files saved to $TEMPDIR" -- 1.7.6

3 10

[pacman-dev] [PATCH] create a typedef for enum _alpm_errno_t
by Jonathan Conder 14 Nov '11

14 Nov '11

This is consistent with the other enums and structs, and should be slightly more readable. Signed-off-by: Jonathan Conder <jonno.conder(a)gmail.com> --- README | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/alpm.h | 10 +++++----- lib/libalpm/error.c | 4 ++-- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 4 ++-- lib/libalpm/sync.c | 4 ++-- src/pacman/callback.c | 2 +- src/pacman/conf.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 6 +++--- src/pacman/util.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README b/README index 0e5a512..c4199dd 100644 --- a/README +++ b/README @@ -389,7 +389,7 @@ API CHANGES BETWEEN 3.5 AND 4.0 - PM_ prefixes for enum values are now ALPM_ - pm prefixes for structs and enums are now alpm_ - alpm_initialize now has parameters: char *root, char *dbpath, - _alpm_errno_t *err and returns an alpm_handle_t struct. + alpm_errno_t *err and returns an alpm_handle_t struct. - alpm_release now takes an alpm_handle_t *. - alpm_db_register_sync() now requires a extra parameter of a alpm_siglevel_t. - alpm_pkg_load() now requires an extra parameter of an alpm_siglevel_t diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 3884334..e957f1a 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -47,9 +47,9 @@ * @return a context handle on success, NULL on error, err will be set if provided */ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, - enum _alpm_errno_t *err) + alpm_errno_t *err) { - enum _alpm_errno_t myerr; + alpm_errno_t myerr; const char *lf = "db.lck"; size_t lockfilelen; alpm_handle_t *myhandle = _alpm_handle_new(); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9fda940..9b2d8a9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1115,7 +1115,7 @@ char *alpm_compute_sha256sum(const char *filename); /** @addtogroup alpm_api_errors Error Codes * @{ */ -enum _alpm_errno_t { +typedef enum _alpm_errno_t { ALPM_ERR_MEMORY = 1, ALPM_ERR_SYSTEM, ALPM_ERR_BADPERMS, @@ -1179,19 +1179,19 @@ enum _alpm_errno_t { ALPM_ERR_LIBCURL, ALPM_ERR_EXTERNAL_DOWNLOAD, ALPM_ERR_GPGME -}; +} alpm_errno_t; /** Returns the current error code from the handle. */ -enum _alpm_errno_t alpm_errno(alpm_handle_t *handle); +alpm_errno_t alpm_errno(alpm_handle_t *handle); /** Returns the string corresponding to an error number. */ -const char *alpm_strerror(enum _alpm_errno_t err); +const char *alpm_strerror(alpm_errno_t err); /* End of alpm_api_errors */ /** @} */ alpm_handle_t *alpm_initialize(const char *root, const char *dbpath, - enum _alpm_errno_t *err); + alpm_errno_t *err); int alpm_release(alpm_handle_t *handle); enum alpm_caps { diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index b3f5681..044dec7 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -29,12 +29,12 @@ #include "alpm.h" #include "handle.h" -enum _alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle) +alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle) { return handle->pm_errno; } -const char SYMEXPORT *alpm_strerror(enum _alpm_errno_t err) +const char SYMEXPORT *alpm_strerror(alpm_errno_t err) { switch(err) { /* System */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7402be5..01f5955 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -339,7 +339,7 @@ static char *canonicalize_path(const char *path) { return new_path; } -enum _alpm_errno_t _alpm_set_directory_option(const char *value, +alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist) { struct stat st; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 8477dca..d568fb4 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -93,7 +93,7 @@ struct __alpm_handle_t { alpm_siglevel_t siglevel; /* Default signature verification level */ /* error code */ - enum _alpm_errno_t pm_errno; + alpm_errno_t pm_errno; }; alpm_handle_t *_alpm_handle_new(void); @@ -102,7 +102,7 @@ void _alpm_handle_free(alpm_handle_t *handle); int _alpm_handle_lock(alpm_handle_t *handle); int _alpm_handle_unlock(alpm_handle_t *handle); -enum _alpm_errno_t _alpm_set_directory_option(const char *value, +alpm_errno_t _alpm_set_directory_option(const char *value, char **storage, int must_exist); #endif /* _ALPM_HANDLE_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 52049a8..3de5c07 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -748,7 +748,7 @@ static int apply_deltas(alpm_handle_t *handle) * @return 1 if file was removed, 0 otherwise */ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, - enum _alpm_errno_t reason) + alpm_errno_t reason) { int doremove = 0; QUESTION(handle, ALPM_QUESTION_CORRUPTED_PKG, (char *)filepath, @@ -965,7 +965,7 @@ static int check_validity(alpm_handle_t *handle, char *path; alpm_siglist_t *siglist; alpm_siglevel_t level; - enum _alpm_errno_t error; + alpm_errno_t error; }; size_t current = 0, current_bytes = 0; alpm_list_t *i, *errors = NULL; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6f39013..3fb5465 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -341,7 +341,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, *response = yesno(_(":: File %s is corrupted (%s).\n" "Do you want to delete it?"), (char *)data1, - alpm_strerror(*(enum _alpm_errno_t *)data2)); + alpm_strerror(*(alpm_errno_t *)data2)); break; case ALPM_QUESTION_IMPORT_KEY: { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2d3009e..004922e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -522,7 +522,7 @@ static int _add_mirror(alpm_db_t *db, char *value) static int setup_libalpm(void) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_handle_t *handle; pm_printf(ALPM_LOG_DEBUG, "setup_libalpm called\n"); diff --git a/src/pacman/remove.c b/src/pacman/remove.c index e63b5c4..425ce45 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -104,7 +104,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index cc70203..1003a42 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -600,7 +600,7 @@ static int process_pkg(alpm_pkg_t *pkg) int ret = alpm_add_pkg(config->handle, pkg); if(ret == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); if(err == ALPM_ERR_TRANS_DUP_TARGET || err == ALPM_ERR_PKG_IGNORED) { /* just skip duplicate or ignored targets */ @@ -766,7 +766,7 @@ int sync_prepare_execute(void) /* Step 2: "compute" the transaction based on targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { @@ -835,7 +835,7 @@ int sync_prepare_execute(void) } if(alpm_trans_commit(config->handle, &data) == -1) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerror(err)); switch(err) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 42f17ea..c0dcb9f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -65,7 +65,7 @@ int trans_init(alpm_transflag_t flags, int check_valid) void trans_init_error(void) { - enum _alpm_errno_t err = alpm_errno(config->handle); + alpm_errno_t err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), alpm_strerror(err)); if(err == ALPM_ERR_HANDLE_LOCK) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 7964609..d6bd0e8 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -94,7 +94,7 @@ static void usage(void) { int main(int argc, char *argv[]) { const char *dbpath = DBPATH; - enum _alpm_errno_t err; + alpm_errno_t err; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/pactree.c b/src/util/pactree.c index bb15b1b..f95c5e8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -443,7 +443,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) int main(int argc, char *argv[]) { int freelist = 0, ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *target_name; alpm_pkg_t *pkg; alpm_list_t *dblist = NULL; diff --git a/src/util/testdb.c b/src/util/testdb.c index 783d499..b15bbe5 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -185,7 +185,7 @@ static void usage(void) int main(int argc, char *argv[]) { int ret = 0; - enum _alpm_errno_t err; + alpm_errno_t err; const char *dbpath = DBPATH; int a = 1; alpm_list_t *dbnames = NULL; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 90758e1..6385e41 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { int retval = 1; /* default = false */ alpm_handle_t *handle; - enum _alpm_errno_t err; + alpm_errno_t err; alpm_pkg_t *pkg = NULL; const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; -- 1.7.7

3 2

[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

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-29-g3343185
by dan＠archlinux.org 27 Oct '11

27 Oct '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 3343185473c79d556b29bda30c9c482c7fef5289 (commit) via 1052709921da50ec5203efaa313dbda75625a4e1 (commit) via 24881034f62cecb9e601fdfee9458f34f32b2507 (commit) via 8a9ce12a27970beb644952a83d27f54d1d7f751a (commit) via 5c1885b55eae870a10c91793d05a74d74a075e83 (commit) via 7a6b01d46c1da385dd34466e757beafa33e02afa (commit) from 2da59e1aa91fa4160ec1c8ec84d94d8141b2a832 (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 3343185473c79d556b29bda30c9c482c7fef5289 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 27 14:59:24 2011 -0500 Introduce ALPM_BUFFER_SIZE constant This takes the place of three previously used constants: ARCHIVE_DEFAULT_BYTES_PER_BLOCK, BUFFER_SIZE, and CPBUFSIZE. In libarchive 3.0, the first constant will be no more, so we can ensure we are forward-compatible by removing our usage of it now. The rest are unified for consistency. By default, we will use the value of BUFSIZ provided by <stdio.h>, which is 8192 on Linux. If that is undefined, a default value is provided. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1052709921da50ec5203efaa313dbda75625a4e1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 24 10:29:15 2011 -0400 paccache: add vim modeline Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 24881034f62cecb9e601fdfee9458f34f32b2507 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 24 10:28:35 2011 -0400 paccache: ensure seen/seenarch vars are set Doesn't do a whole lot of good to compare against values that are never set. Fixes bug where -vvv output wasn't grouping packages together properly. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8a9ce12a27970beb644952a83d27f54d1d7f751a Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 26 17:32:46 2011 -0500 Fix issues with replacing unowned symlinks There aretwo seperate issues in the same block of file conflict checking code here: 1) If realpath errored, such as when a symlink was broken, we would call 'continue' rather than simply exit this particular method of resolution. This was likely just a copy-paste mistake as the previous resolving steps all use loops where continue makes sense. Refactor the check so we only proceed if realpath is successful, and continue with the rest of the checks either way. 2) The real problem this code was trying to solve was canonicalizing path component (e.g., directory) symlinks. The final component, if not a directory, should not be handled at all in this loop. Add a !S_ISLNK() condition to the loop so we only call this for real files. There are few other small cleanups to the debug messages that I made while debugging this problem- we don't need to keep printing the file name, and ensure every block that sets resolved_conflict to true prints a debug message so we know how it was resolved. This fixes the expected failures from symlink010.py and symlink011.py, while still ensuring the fix for fileconflict007.py works. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c1885b55eae870a10c91793d05a74d74a075e83 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 26 16:43:36 2011 -0500 Add some unowned symlink replacement tests These should all prevent installation, and yet two of the three tests currently fail. Not good. The best way to see what is going on here is to diff the three new tests side by side- there is only a small difference between the three tests, and that is in the destination of the symlink in question that should never be overwritten. symlink010.py: myprogsuffix -> myprog symlink011.py: myprogsuffix -> broken symlink012.py: myprogsuffix -> otherprog Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7a6b01d46c1da385dd34466e757beafa33e02afa Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 26 15:44:55 2011 -0500 Don't realloc a 0-length files array when loading packages There is some pecular behavior going on here when a package is loaded that has no files, as is very common in our test suite. When we enter the realloc/sort code, a package without files will call the following: files = realloc(NULL, 0); One would assume this is a no-op, returning a NULL pointer, but that is not the case and valgrind later reports we are leaking memory. Fix the whole thing by skipping the reallocation and sort steps if the pointer is NULL, as we have nothing to do. Note that the package still gets marked as 'files loaded', becuase although there were none, we tried and were successful. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 3 +++ lib/libalpm/add.c | 11 +++++++---- lib/libalpm/be_package.c | 22 ++++++++++++---------- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 33 +++++++++++++++++++-------------- lib/libalpm/util.c | 20 ++++++++------------ lib/libalpm/util.h | 7 +++++++ test/pacman/tests/fileconflict007.py | 2 +- test/pacman/tests/symlink010.py | 24 ++++++++++++++++++++++++ test/pacman/tests/symlink011.py | 24 ++++++++++++++++++++++++ test/pacman/tests/symlink012.py | 24 ++++++++++++++++++++++++ 11 files changed, 130 insertions(+), 42 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] [PATCH 1/3] libalpm/util: two stat() related cleanups
by Dan McGee 26 Oct '11

26 Oct '11

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> --- lib/libalpm/util.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0d499ad..af9cf42 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -160,12 +160,10 @@ int _alpm_copyfile(const char *src, const char *dest) } } - /* chmod dest to permissions of src, as long as it is not a symlink */ + /* chmod dest to permissions of src */ struct stat statbuf; - if(!stat(src, &statbuf)) { - if(! S_ISLNK(statbuf.st_mode)) { - fchmod(fileno(out), statbuf.st_mode); - } + if(!fstat(fileno(in), &statbuf)) { + fchmod(fileno(out), statbuf.st_mode); } else { /* stat was unsuccessful */ ret = 1; @@ -313,18 +311,11 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, } while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { - const struct stat *st; - const char *entryname; /* the name of the file in the archive */ + const char *entryname; + mode_t mode; - st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - if(S_ISREG(st->st_mode)) { - archive_entry_set_perm(entry, 0644); - } else if(S_ISDIR(st->st_mode)) { - archive_entry_set_perm(entry, 0755); - } - /* If specific files were requested, skip entries that don't match. */ if(list) { char *entry_prefix = strdup(entryname); @@ -345,6 +336,13 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, } } + mode = archive_entry_mode(entry); + if(S_ISREG(mode)) { + archive_entry_set_perm(entry, 0644); + } else if(S_ISDIR(mode)) { + archive_entry_set_perm(entry, 0755); + } + /* Extract the archive entry. */ int readret = archive_read_extract(_archive, entry, 0); if(readret == ARCHIVE_WARN) { @@ -555,6 +553,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[] } umask(0022); execv(path, argv); + /* execv only returns if there was an error */ fprintf(stderr, _("call to execv failed (%s)\n"), strerror(errno)); exit(1); } else { -- 1.7.7

3 4

[pacman-dev] [PATCH 1/3] Don't realloc a 0-length files array when loading packages
by Dan McGee 26 Oct '11

26 Oct '11

There is some pecular behavior going on here when a package is loaded that has no files, as is very common in our test suite. When we enter the realloc/sort code, a package without files will call the following: files = realloc(NULL, 0); One would assume this is a no-op, returning a NULL pointer, but that is not the case and valgrind later reports we are leaking memory. Fix the whole thing by skipping the reallocation and sort steps if the pointer is NULL, as we have nothing to do. Note that the package still gets marked as 'files loaded', becuase although there were none, we tried and were successful. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint; so valgrind messages can stay cleaner and it is a pretty low-risk, obvious fix. lib/libalpm/be_package.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c20c703..c8e08e2 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -482,17 +482,19 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, newpkg->origin_data.file = strdup(pkgfile); newpkg->ops = get_file_pkg_ops(); newpkg->handle = handle; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; if(full) { - /* attempt to hand back any memory we don't need */ - files = realloc(files, sizeof(alpm_file_t) * files_count); - /* "checking for conflicts" requires a sorted list, ensure that here */ - _alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files.files = files_msort(files, files_count); + if(files) { + /* attempt to hand back any memory we don't need */ + files = realloc(files, sizeof(alpm_file_t) * files_count); + /* "checking for conflicts" requires a sorted list, ensure that here */ + _alpm_log(handle, ALPM_LOG_DEBUG, + "sorting package filelist for %s\n", pkgfile); + newpkg->files.files = files_msort(files, files_count); + } newpkg->files.count = files_count; - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES | INFRQ_SCRIPTLET; - } else { - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; + newpkg->infolevel |= INFRQ_FILES; } return newpkg; -- 1.7.7

1 2

[pacman-dev] checkupdates
by keenerd 26 Oct '11

26 Oct '11

There are a number of utilities and tray widgets that inform you of updates. Many of these are poorly written accidents waiting to happen, because they essentially run pacman -Sy in cron. Here is a little script, checkupdates, that handles this in a safe and sane fashion. I feel it would make a good addition to pacman-contrib. Thoughts? -Kyle http://kmkeen.com

8 18

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-53-ga708e7d
by dan＠archlinux.org 25 Oct '11

25 Oct '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 a708e7d28e890c3e230a215629b7f5c58c57f58d (commit) via 2da59e1aa91fa4160ec1c8ec84d94d8141b2a832 (commit) via 571f2f78141a5c13aaf90cfbfe99c04af8158e4e (commit) via 0d9e7da309f27c099814232d0f1be1b2ae884b2a (commit) via 5853025137e64411d7be745a55936ec3e8868212 (commit) from 90ddcbe71d483884b7627237121b1dee05b07dd0 (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 a708e7d28e890c3e230a215629b7f5c58c57f58d Merge: 90ddcbe 2da59e1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 25 10:40:26 2011 -0500 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 14 ++++++-- lib/libalpm/sync.c | 8 +++- ltmain.sh | 85 +++++++++++++++++++++++++++++++-------------------- m4/ltversion.m4 | 10 +++--- 4 files changed, 74 insertions(+), 43 deletions(-) mode change 100755 => 100644 ltmain.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-23-g2da59e1
by dan＠archlinux.org 25 Oct '11

25 Oct '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 2da59e1aa91fa4160ec1c8ec84d94d8141b2a832 (commit) via 571f2f78141a5c13aaf90cfbfe99c04af8158e4e (commit) via 0d9e7da309f27c099814232d0f1be1b2ae884b2a (commit) via 5853025137e64411d7be745a55936ec3e8868212 (commit) from d6e3446e70bcda9c0f28d80110d588106daa4b5c (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 2da59e1aa91fa4160ec1c8ec84d94d8141b2a832 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Oct 18 10:46:47 2011 -0400 lib/sync: inform callers of compute_download_size of a partial Extend the return values of compute_download_size to allow callers to know that a .part file exists for the package. This extra value isn't currently used, but it'll be needed later on. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 571f2f78141a5c13aaf90cfbfe99c04af8158e4e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 22 18:29:05 2011 +1000 Fix libtool detection of --as-needed flag The fix for -Wl,--as-needed in commit b0f9477f assumes that --as-needed/--no-as-needed is the only option given in a -Wl line. However, it is perfectly valid to specify multiple flags comma separated after a single -Wl (e.g. the default LDFLAGS in Arch Linux makepkg.conf). Adjust the fix so it detect --as-needed in a more general context > readelf -d lib/libalpm/.libs/libalpm.so.?.?.? | grep NEEDED | wc -l Before: 13 After: 5 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d9e7da309f27c099814232d0f1be1b2ae884b2a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 22 17:22:08 2011 +1000 Update libtool files Update for libtool-2.4.2 while keeping the fix for --as-needed from commit b0f9477f. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5853025137e64411d7be745a55936ec3e8868212 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 24 13:49:14 2011 -0500 Add more logging to download code This adds a logger to the CURLE_OK case so we can always know the return code if it was >= 400, and debug log it regardless. Also adjust another logger to use the cURL error message directly, as well as use fstat() when we have an open file handle rather than stat(). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 14 ++++++-- lib/libalpm/sync.c | 8 +++- ltmain.sh | 85 +++++++++++++++++++++++++++++++-------------------- m4/ltversion.m4 | 10 +++--- 4 files changed, 74 insertions(+), 43 deletions(-) mode change 100755 => 100644 ltmain.sh hooks/post-receive -- The official pacman repository

1 0