- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-13-g5b749ee
by dan＠archlinux.org 29 Dec '11

29 Dec '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 5b749eeee999b5b332ad7545688297a37542b9a5 (commit) via d95c04945fc85bcc584026f7fded57dc8724ba6a (commit) from 67290441b80fa813a472767353095425c78805af (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 5b749eeee999b5b332ad7545688297a37542b9a5 Author: Timothy Redaelli <timothy.redaelli(a)gmail.com> Date: Fri Dec 23 17:52:11 2011 +0100 pacman-key: Add missing quotes Signed-off-by: Timothy Redaelli <timothy.redaelli(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d95c04945fc85bcc584026f7fded57dc8724ba6a Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 22 17:46:47 2011 +1000 Allow comments after repo section header in pacman.conf Pacman assumes that the final character of a line specifing a repo in pacman.conf is a "]". But it did not clean whitespace from the line after removing any comments. So lines like: [allanbrokeit] # could break system caused pacman not to recognize the repo. Adjust config parsing to strip comments before trimming whitespace from the end of the string. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/pacman-key.sh.in | 6 +++--- src/pacman/conf.c | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] [RFC] makepkg: calculate exact total file size
by Allan McRae 25 Dec '11

25 Dec '11

The current calculation of the total file size for a package using "du" suffers from issues in portability and correctness. Especially on btrfs, this can result in clearly wrong package information such as: Download Size : 14684.29 KiB Installed Size : 7628.00 KiB Use a slower but more accurate method involving "cat" and "wc" to calculate total file size. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 1 - scripts/Makefile.am | 1 - scripts/makepkg.sh.in | 3 +-- 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fb1e0b3..6941054 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,6 @@ esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") -AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 328fbff..727de25 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,7 +53,6 @@ edit = sed \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ - -e 's|@DUPATH[@]|$(DUPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8c6984d..c78db86 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1132,8 +1132,7 @@ write_pkginfo() { else local packager="Unknown Packager" fi - local size="$(@DUPATH@ -sk)" - size="$(( ${size%%[^0-9]*} * 1024 ))" + local size="$(find . | xargs cat 2>/dev/null | wc -c)" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" echo "# Generated by makepkg $myver" -- 1.7.8.1

3 6

[pacman-dev] [PATCH] makepkg: rework libprovides
by Allan McRae 25 Dec '11

25 Dec '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> --- Fixed version. scripts/makepkg.sh.in | 89 +++++++++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 39 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 64b33c6..8c6984d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1076,30 +1076,53 @@ 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) + local filename=$(find "$pkgdir" -type f -name $p\*) + if [[ $filename ]]; then + # packages may provide multiple versions of the same library + for fn in ${filename[@]}; do + # check if we really have a shared object + if LC_ALL=C readelf -h "$fn" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then + # get the string binaries link to (e.g. libfoo.so.1.2 -> libfoo.so.1) + local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') + if [[ -z "$sofile" ]]; then + warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p" + libprovides=(${libprovides[@]} "$p") + continue + fi + + # get the library architecture (32 or 64 bit) + local soarch=$(LC_ALL=C readelf -h "$fn" | sed -n 's/.*Class.*ELF$32\|64$/\1/p') + + # extract the library major version + local soversion="${sofile##*\.so\.}" + + libprovides=(${libprovides[@]} "${p}=${soversion}-${soarch}") + else + warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p" + libprovides=(${libprovides[@]} "$p") + fi + done + 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() { @@ -1133,13 +1156,15 @@ write_pkginfo() { [[ $groups ]] && printf "group = %s\n" "${groups[@]}" [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $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 @@ -1155,20 +1180,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 "Cannot 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.8.1

2 1

[pacman-dev] [PATCH] makepkg: rework libprovides
by Allan McRae 25 Dec '11

25 Dec '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> --- scripts/makepkg.sh.in | 85 +++++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 64b33c6..08c4384 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1076,30 +1076,51 @@ 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##*/}" + local libprovides missing + for p in ${provides[@]}; do + missing=0 + case "$p" in + *.so) + local filename=$(find "$pkgdir" -type f -name $p\*) + # packages may provide multiple versions of the same library + for fn in ${filename[@]}; do + # check if we really have a shared object + if LC_ALL=C readelf -h "$fn" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then + # get the string binaries link to (e.g. libfoo.so.1.2 -> libfoo.so.1) + local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[$.*$\].*/\1/p') + if [[ -z "$sofile" ]]; then + warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p" + libprovides=(${libprovides[@]} "$p") + continue + fi - # 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}") + # get the library architecture (32 or 64 bit) + local soarch=$(LC_ALL=C readelf -h "$fn" | sed -n 's/.*Class.*ELF$32\|64$/\1/p') + + # extract the library major version + local soversion="${sofile##*\.so\.}" + + libprovides=(${libprovides[@]} "${p}=${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() { @@ -1133,13 +1154,15 @@ write_pkginfo() { [[ $groups ]] && printf "group = %s\n" "${groups[@]}" [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $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 @@ -1155,20 +1178,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 "Cannot 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.8.1

2 2

[pacman-dev] [PATCH] Prevent rebuild of man pages when using release tarballs
by Allan McRae 24 Dec '11

24 Dec '11

Commit 43cad9c8 made the building of all docs depend on the Makefile. However, the Makefile is generated after running ./configure so is always newer than any pregenerated docs. This means that people building from released pacman tarballs are forced to rebuild the docs (and thus have asciidoc installed). That defeats the purpose of prebuilding the documentation. Have the documentatin depends on Makefile.am instead as this is probably what was intended. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Two things: 1) That was a massive commit message for the addition of 9 characters! 2) Somebody did not build the Arch Linux pacman package in a clean chroot or else failures due to missing asciidoc would have occurred... doc/Makefile.am | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c6cc50..a2018c7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -120,7 +120,7 @@ A2X_OPTS = \ --destination-dir='./' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt @@ -132,8 +132,8 @@ HACKING.html: ../HACKING sed -e 's/\r$$//' > $@ # Customizations for certain HTML docs -$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile -$(HTML_OTHER): asciidoc.conf Makefile +$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am +$(HTML_OTHER): asciidoc.conf Makefile.am %.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.8.html: ASCIIDOC_OPTS += -d manpage %.5.html: ASCIIDOC_OPTS += -d manpage -- 1.7.8.1

1 0

[pacman-dev] [PATCH 1/2] be_package: be more explicit parsing key/value pairs
by Dan McGee 24 Dec '11

24 Dec '11

This eliminates the need for strtrim() usage completely, instead relying on the fact that the only allowed delimiter between key and value is the " = " string. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 41ecc75..c602996 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -171,18 +171,21 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * size_t len = _alpm_strip_newline(buf.line); linenum++; - if(len == 0 || buf.line[0] == '#') { + key = buf.line; + if(len == 0 || key[0] == '#') { continue; } - ptr = buf.line; - key = strsep(&ptr, "="); - if(key == NULL || ptr == NULL) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s: syntax error in description file line %d\n", - newpkg->name ? newpkg->name : "error", linenum); + /* line is always in this format: "key = value" + * we can be sure the " = " exists, so look for that */ + ptr = memchr(key, ' ', len); + if(!ptr || ptr - key + 2 > len || memcmp(ptr, " = ", 3) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: syntax error in description file line %d\n", + newpkg->name ? newpkg->name : "error", linenum); } else { - key = _alpm_strtrim(key); - while(*ptr == ' ') ptr++; - ptr = _alpm_strtrim(ptr); + /* NULL the end of the key portion, move ptr to start of value */ + *ptr = '\0'; + ptr += 3; if(strcmp(key, "pkgname") == 0) { STRDUP(newpkg->name, ptr, return -1); newpkg->name_hash = _alpm_hash_sdbm(newpkg->name); -- 1.7.8.1

2 2

[pacman-dev] [PATCH 1/3] pacman/util: return size_t from strtrim
by Dave Reisner 23 Dec '11

23 Dec '11

Instead of returning the same value as the parameter to this function, return the length of the string, which can be useful to the caller when its non-zero (e.g. to find the end of the string). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This should make an earlier email from dan make a bit more sense when he referred to "the new return value" src/pacman/util.c | 18 +++++++++--------- src/pacman/util.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7846291..4160c44 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -325,13 +325,13 @@ char *strtoupper(char *str) /* Trim whitespace and newlines from a string */ -char *strtrim(char *str) +size_t strtrim(char *str) { - char *pch = str; + char *end, *pch = str; if(str == NULL || *str == '\0') { /* string is empty, so we're done. */ - return str; + return 0; } while(isspace((unsigned char)*pch)) { @@ -348,16 +348,16 @@ char *strtrim(char *str) /* check if there wasn't anything but whitespace in the string. */ if(*str == '\0') { - return str; + return 0; } - pch = (str + (strlen(str) - 1)); - while(isspace((unsigned char)*pch)) { - pch--; + end = (str + strlen(str) - 1); + while(isspace((unsigned char)*end)) { + end--; } - *++pch = '\0'; + *++end = '\0'; - return str; + return end - pch; } /* Replace all occurances of 'needle' with 'replace' in 'str', returning diff --git a/src/pacman/util.h b/src/pacman/util.h index 6ec962f..6291939 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -56,7 +56,7 @@ const char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, size_t indent); char *strtoupper(char *str); -char *strtrim(char *str); +size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); void string_display(const char *title, const char *string); -- 1.7.8.1

1 2

[pacman-dev] [PATCH] Convert strtrim/strlen paired calls to only strtrim
by Dan McGee 23 Dec '11

23 Dec '11

This utilizes the new return value so we don't have to find the length of the string again. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 3 +-- src/pacman/util.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 117aecd4..7ba2791 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -726,8 +726,7 @@ static int _parseconfig(const char *file, struct section_t *section, *ptr = '\0'; } - strtrim(line); - line_len = strlen(line); + line_len = strtrim(line); if(line_len == 0) { continue; diff --git a/src/pacman/util.c b/src/pacman/util.c index 4160c44..467bedf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1228,14 +1228,14 @@ static int multiselect_parse(char *array, int count, char *response) for(str = response; ; str = NULL) { int include = 1; int start, end; + size_t len; char *ends = NULL; char *starts = strtok_r(str, " ", &saveptr); if(starts == NULL) { break; } - strtrim(starts); - int len = strlen(starts); + len = strtrim(starts); if(len == 0) continue; @@ -1314,6 +1314,7 @@ int multiselect_question(char *array, int count) if(fgets(response, response_len, stdin)) { const size_t response_incr = 64; + size_t len; /* handle buffer not being large enough to read full line case */ while(*lastchar == '\0' && lastchar[-1] != '\n') { response_len += response_incr; @@ -1330,8 +1331,9 @@ int multiselect_question(char *array, int count) return -1; } } - strtrim(response); - if(strlen(response) > 0) { + + len = strtrim(response); + if(len > 0) { if(multiselect_parse(array, count, response) == -1) { /* only loop if user gave an invalid answer */ continue; @@ -1374,8 +1376,8 @@ int select_question(int count) flush_term_input(); if(fgets(response, sizeof(response), stdin)) { - strtrim(response); - if(strlen(response) > 0) { + size_t len = strtrim(response); + if(len > 0) { int n; if(parseindex(response, &n, 1, count) != 0) continue; @@ -1423,8 +1425,8 @@ static int question(short preset, char *fmt, va_list args) flush_term_input(); if(fgets(response, sizeof(response), stdin)) { - strtrim(response); - if(strlen(response) == 0) { + size_t len = strtrim(response); + if(len == 0) { return preset; } -- 1.7.8.1

1 0

[pacman-dev] [PATCH] pacman-key: Add some variable quotes and fix vim modeline for securemodelines
by Timothy Redaelli 23 Dec '11

23 Dec '11

From: Timothy Redaelli <timothy.redaelli(a)gmail.com> Signed-off-by: Timothy Redaelli <timothy.redaelli(a)gmail.com> --- scripts/pacman-key.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e0f48f5..c033da4 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -450,9 +450,9 @@ fi # file, falling back on a hard default PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" "@sysconfdir@/pacman.d/gnupg")} -GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) +GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) if [[ -n ${KEYSERVER} ]]; then - GPG_PACMAN+=(--keyserver ${KEYSERVER}) + GPG_PACMAN+=(--keyserver "${KEYSERVER}") fi # check only a single operation has been given @@ -492,11 +492,11 @@ fi (( POPULATE )) && populate_keyring (( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}" (( REFRESH )) && "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}" -(( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE +(( VERIFY )) && "${GPG_PACMAN[@]}" --verify "$SIGNATURE" if (( UPDATEDB )); then msg "$(gettext "Updating trust database...")" "${GPG_PACMAN[@]}" --batch --check-trustdb fi -# vim: set ts=2 sw=2 noet: +# vim: set ts=2 sw=2 noet -- 1.7.8.1

3 3

[pacman-dev] [PATCH] Rework package removal code
by Dan McGee 23 Dec '11

23 Dec '11

Extract the actual unlinking of files into a new method, which eliminates a goto used for flow control. Also fix up a few small issues in the code: * Unnecessary (unsigned long) cast, use '%zd' instead * Total up errors returned from unlink_file calls and return to caller * Be consistent with scriptlets- we run pre_remove on dbonly, so we should also run post_remove. Both can be disabled by way of the --noscriptlet argument. * Don't pass an invalid pointer to oldpkg to the event callbacks; instead call the callback before we free the object. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 99 +++++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 45 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8967eff..b43d1a6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -354,38 +354,15 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, return 0; } -int _alpm_remove_single_package(alpm_handle_t *handle, +static int remove_package_files(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) { alpm_list_t *skip_remove; - size_t filenum = 0, position = 0; - const char *pkgname = oldpkg->name; - const char *pkgver = oldpkg->version; alpm_filelist_t *filelist; - size_t i; - - if(newpkg) { - _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", - pkgname, pkgver); - } else { - EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", - pkgname, pkgver); - - /* run the pre-remove scriptlet if it exists */ - if(alpm_pkg_has_scriptlet(oldpkg) && - !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, - oldpkg, "install"); - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); - free(scriptlet); - } - } - - if(handle->trans->flags & ALPM_TRANS_FLAG_DBONLY) { - goto db; - } + size_t i, filenum = 0, position = 0; + int err = 0; + int nosave = handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE; if(newpkg) { alpm_filelist_t *newfiles; @@ -416,32 +393,33 @@ int _alpm_remove_single_package(alpm_handle_t *handle, alpm_file_t *file = filelist->files + i; if(!can_remove_file(handle, file, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, - "not removing package '%s', can't remove all files\n", pkgname); + "not removing package '%s', can't remove all files\n", + oldpkg->name); + FREELIST(skip_remove); RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } filenum++; } - _alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zd files\n", filenum); if(!newpkg) { /* init progress bar, but only on true remove transactions */ - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, 0, + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, 0, pkg_count, targ_count); } /* iterate through the list backwards, unlinking files */ for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; - int percent; - /* TODO: check return code and handle accordingly */ - unlink_file(handle, oldpkg, newpkg, file, skip_remove, - handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); + if(unlink_file(handle, oldpkg, newpkg, file, skip_remove, nosave) < 0) { + err++; + } if(!newpkg) { /* update progress bar after each file */ - percent = (position * 100) / filenum; - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, + int percent = (position * 100) / filenum; + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, percent, pkg_count, targ_count); } position++; @@ -450,20 +428,56 @@ int _alpm_remove_single_package(alpm_handle_t *handle, if(!newpkg) { /* set progress to 100% after we finish unlinking files */ - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, 100, + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, 100, pkg_count, targ_count); + } + + return err; +} + +int _alpm_remove_single_package(alpm_handle_t *handle, + alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, + size_t targ_count, size_t pkg_count) +{ + const char *pkgname = oldpkg->name; + const char *pkgver = oldpkg->version; + + if(newpkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", + pkgname, pkgver); + } else { + EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", + pkgname, pkgver); - /* run the post-remove script if it exists */ + /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, oldpkg, "install"); - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); free(scriptlet); } } -db: + if(!(handle->trans->flags & ALPM_TRANS_FLAG_DBONLY)) { + /* TODO check returned errors if any */ + remove_package_files(handle, oldpkg, newpkg, targ_count, pkg_count); + } + + /* run the post-remove script if it exists */ + if(!newpkg && alpm_pkg_has_scriptlet(oldpkg) && + !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, + oldpkg, "install"); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); + free(scriptlet); + } + + if(!newpkg) { + EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL); + } + /* remove the package from the database */ _alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); @@ -477,11 +491,6 @@ db: pkgname); } - if(!newpkg) { - /* TODO: awesome! we're passing invalid pointers. */ - EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL); - } - return 0; } -- 1.7.8.1

1 0

[pacman-dev] [PATCH] allow querying fileowner for directories
by andrew.gregory.8＠gmail.com 23 Dec '11

23 Dec '11

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Not allowing fileowner queries for directories was an unnecessary limitation. Queries for directories have poor performance due to having to call real_path on every directory listed in every package's file list. Because more than one package will likely own a given directory, all packages are now checked instead of bailing out after the first owner is found. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 4c2ea81..8162662 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -127,7 +127,7 @@ static int query_fileowner(alpm_list_t *targets) * iteration. */ root = alpm_option_get_root(config->handle); rootlen = strlen(root); - if(rootlen + 1 > PATH_MAX) { + if(rootlen >= PATH_MAX) { /* we are in trouble here */ pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); return 1; @@ -164,12 +164,13 @@ static int query_fileowner(alpm_list_t *targets) } } + /* make sure directories end with '/' */ if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + int fnlen = strlen(filename); + if(filename[fnlen-1] != '/'){ + filename = realloc(filename, sizeof(*filename) * (fnlen+2)); + strcat(filename, "/"); + } } bname = mbasename(filename); @@ -192,7 +193,7 @@ static int query_fileowner(alpm_list_t *targets) } free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + for(i = alpm_db_get_pkgcache(db_local); i ; i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -214,7 +215,7 @@ static int query_fileowner(alpm_list_t *targets) continue; } - if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { + if(rootlen + strlen(pkgfile) >= PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile); } /* concatenate our file and the root path */ -- 1.7.7.3

4 9

[pacman-dev] [PATCH] Allow comments after repo section header in pacman.conf
by Allan McRae 22 Dec '11

22 Dec '11

Pacman assumes that the final character of a line specifing a repo in pacman.conf is a "]". But it did not clean whitespace from the line after removing any comments. So lines like: [allanbrokeit] # could break system caused pacman not to recognize the repo. Adjust config parsing to strip comments before trimming whitespace from the end of the string. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 6703243..117aecd4 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -720,17 +720,19 @@ static int _parseconfig(const char *file, struct section_t *section, size_t line_len; linenum++; - strtrim(line); - line_len = strlen(line); /* ignore whole line and end of line comments */ - if(line_len == 0 || line[0] == '#') { - continue; - } if((ptr = strchr(line, '#'))) { *ptr = '\0'; } + strtrim(line); + line_len = strlen(line); + + if(line_len == 0) { + continue; + } + if(line[0] == '[' && line[line_len - 1] == ']') { char *name; /* only possibility here is a line == '[]' */ -- 1.7.8.1

2 1

[pacman-dev] [PATCH] makepkg: Use SKIP in checksum to skip integrity check
by Allan McRae 22 Dec '11

22 Dec '11

Using the value of "SKIP" in the checksum array will cause that integrity check to be skipped. This makes building packages that rely on user configurable sources less painful. Based-on-patch-by: Dan McGee <dan(a)archlinux.org> Based-on-patch-by: David Campbell <davekong(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 7 ++++--- scripts/makepkg.sh.in | 18 +++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fad93e5..cd6b09f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -120,9 +120,10 @@ of the corresponding source file. *md5sums (array)*:: This array contains an MD5 hash for every source file specified in the source array (in the same order). makepkg will use this to verify source - file integrity during subsequent builds. To easily generate md5sums, run - `makepkg -g >> PKGBUILD`. If desired, move the md5sums line to an - appropriate location. + file integrity during subsequent builds. If 'SKIP' is put in the array + in place of a normal hash, the integrity check for that source file will + be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If + desired, move the md5sums line to an appropriate location. *sha1sums, sha256sums, sha384sums, sha512sums (arrays)*:: Alternative integrity checks that makepkg supports; these all behave diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a4a3d13..64b33c6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -663,14 +663,18 @@ check_checksums() { fi if (( $found )) ; then - local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") - local realsum="$(openssl dgst -${integ} "$file")" - realsum="${realsum##* }" - if [[ $expectedsum = $realsum ]]; then - echo "$(gettext "Passed")" >&2 + if [[ ${integrity_sums[$idx]} = 'SKIP' ]]; then + echo "$(gettext "Skipped")" >&2 else - echo "$(gettext "FAILED")" >&2 - errors=1 + local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") + local realsum="$(openssl dgst -${integ} "$file")" + realsum="${realsum##* }" + if [[ $expectedsum = $realsum ]]; then + echo "$(gettext "Passed")" >&2 + else + echo "$(gettext "FAILED")" >&2 + errors=1 + fi fi fi -- 1.7.8.1

1 0

[pacman-dev] [PATCH] makepkg: Use SKIP in checksum to skip integrity check
by Allan McRae 22 Dec '11

22 Dec '11

Using the value of "SKIP" in the checksum array will cause that integrity check to be skipped. This makes building packages that rely on user configurable sources less painful. Based-on-patch-by: Dan McGee <dan(a)archlinux.org> Based-on-patch-by: David Campbell <davekong(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 7 ++++--- scripts/makepkg.sh.in | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fad93e5..cd6b09f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -120,9 +120,10 @@ of the corresponding source file. *md5sums (array)*:: This array contains an MD5 hash for every source file specified in the source array (in the same order). makepkg will use this to verify source - file integrity during subsequent builds. To easily generate md5sums, run - `makepkg -g >> PKGBUILD`. If desired, move the md5sums line to an - appropriate location. + file integrity during subsequent builds. If 'SKIP' is put in the array + in place of a normal hash, the integrity check for that source file will + be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If + desired, move the md5sums line to an appropriate location. *sha1sums, sha256sums, sha384sums, sha512sums (arrays)*:: Alternative integrity checks that makepkg supports; these all behave diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a4a3d13..c4a0031 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -668,6 +668,8 @@ check_checksums() { realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then echo "$(gettext "Passed")" >&2 + elif [[ $expectedsum = 'SKIP' ]]; then + echo "$(gettext "Skipped")" >&2 else echo "$(gettext "FAILED")" >&2 errors=1 -- 1.7.8

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-90-g7b2f68c
by dan＠archlinux.org 22 Dec '11

22 Dec '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 7b2f68cc21df469342cb1caa7ec8fb27005cd2dd (commit) via d6ccd4439044978a6dcc01b8c1ab880b6164f9d1 (commit) via 6c1426842af7de1343b8360e2d0ca52846ea4a2f (commit) via ee969006056c86e88d5f179a7575d64f23d5b252 (commit) via 71164b76c4df1ba28d7280136050a84d39490f26 (commit) via 4c5e7af32f91771f3589eedd30ddffb72194fbe7 (commit) from 2a4df070c360bfe31d99e232b75bdea06949245f (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 7b2f68cc21df469342cb1caa7ec8fb27005cd2dd Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Wed Dec 21 23:31:55 2011 +0000 Created hex_representation() in lib/libalpm/util.c Used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6ccd4439044978a6dcc01b8c1ab880b6164f9d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Dec 17 21:42:35 2011 -0500 include config.h via Makefiles Ensures that config.h is always ordered correctly (first) in the includes. Also means that new source files get this for free without having to remember to add it. We opt for -imacros over -include as its more portable, and the added constraint by -imacros doesn't bother us for config.h. This also touches the HACKING file to remove the explicit mention of config.h as part of the includes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6c1426842af7de1343b8360e2d0ca52846ea4a2f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 21 17:00:28 2011 -0600 Add note to HACKING about operator spacing commit ee969006056c86e88d5f179a7575d64f23d5b252 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 21 16:42:47 2011 -0600 Don't check diskspace when using --dbonly Mostly a waste of time. Sure, we no longer make sure your pacman database partition has enough space, but if you are using this option you better know what you are doing anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 71164b76c4df1ba28d7280136050a84d39490f26 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 24 13:49:07 2011 -0500 sync: avoid checking file conflicts with --dbonly Scratches my own itch from FS#25667 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c5e7af32f91771f3589eedd30ddffb72194fbe7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 30 15:00:00 2011 -0400 delta: use regex substring matching Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 15 +++++++++- lib/libalpm/Makefile.am | 3 ++ lib/libalpm/add.c | 2 - lib/libalpm/alpm.c | 2 - lib/libalpm/backup.c | 2 - lib/libalpm/be_local.c | 2 - lib/libalpm/be_package.c | 2 - lib/libalpm/be_sync.c | 2 - lib/libalpm/conflict.c | 2 - lib/libalpm/db.c | 2 - lib/libalpm/delta.c | 45 +++++++++++++++------------------ lib/libalpm/delta.h | 2 - lib/libalpm/deps.c | 2 - lib/libalpm/diskspace.c | 2 - lib/libalpm/dload.c | 2 - lib/libalpm/error.c | 2 - lib/libalpm/graph.c | 2 - lib/libalpm/graph.h | 2 - lib/libalpm/group.c | 2 - lib/libalpm/handle.c | 2 - lib/libalpm/log.c | 2 - lib/libalpm/package.c | 2 - lib/libalpm/package.h | 2 - lib/libalpm/remove.c | 2 - lib/libalpm/signing.c | 2 - lib/libalpm/sync.c | 6 +--- lib/libalpm/trans.c | 2 - lib/libalpm/util.c | 62 ++++++++++++++++++++-------------------------- lib/libalpm/util.h | 2 - lib/libalpm/version.c | 2 - src/pacman/Makefile.am | 5 +++- src/pacman/callback.c | 2 - src/pacman/conf.c | 2 - src/pacman/database.c | 2 - src/pacman/deptest.c | 2 - src/pacman/package.c | 2 - src/pacman/pacman.c | 2 - src/pacman/query.c | 2 - src/pacman/remove.c | 2 - src/pacman/sync.c | 2 - src/pacman/upgrade.c | 2 - src/pacman/util.c | 2 - src/util/Makefile.am | 5 +++- src/util/cleanupdelta.c | 2 - src/util/pacsort.c | 2 - src/util/pactree.c | 2 - src/util/testdb.c | 2 - 47 files changed, 73 insertions(+), 148 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum().
by Diogo Sousa 21 Dec '11

21 Dec '11

[PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/util.c | 56 ++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..399331a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,7 +917,30 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif -static const char *hex_digits = "0123456789abcdef"; +/** Create a string representing bytes in hexadecimal. + * + * @param bytes the bytes to represent in hexadecimal. + * @param size number of bytes to consider. + * @return a nul terminated string with the hexadecimal representation + * of bytes or NULL on error. This string must be freed. + */ +static char *hex_representation(unsigned char *bytes, size_t size) +{ + static const char *hex_digits = "0123456789abcdef"; + char *str; + int i; + + MALLOC(str, 2 * size + 1, return NULL); + + for (i = 0; i < size; i++) { + str[2 * i] = hex_digits[bytes[i] >> 4]; + str[2 * i + 1] = hex_digits[bytes[i] & 0x0f]; + } + + str[2 * size] = '\0'; + + return str; +} /** Get the md5 sum of file. * @param filename name of the file @@ -927,29 +950,17 @@ static const char *hex_digits = "0123456789abcdef"; char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; - char *md5sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(md5sum, (size_t)33, return NULL); - /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); if(ret > 0) { - free(md5sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 16; 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; + return hex_representation(output, 16); } /** Get the sha256 sum of file. @@ -960,29 +971,18 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char SYMEXPORT *alpm_compute_sha256sum(const char *filename) { unsigned char output[32]; - char *sha256sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); if(ret > 0) { - free(sha256sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 32; 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; + return hex_representation(output, 32); } /** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. -- 1.7.8

1 0

[pacman-dev] [PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum().
by Diogo Sousa 21 Dec '11

21 Dec '11

Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/util.c | 56 ++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..2fe6087 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,7 +917,30 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif -static const char *hex_digits = "0123456789abcdef"; +/** Create a string representing bytes in hexadecimal. + * + * @param bytes the bytes to represent in hexadecimal. + * @param size number of bytes to consider. + * @return a nul terminated string with the hexadecimal representation + * of bytes or NULL on error. This string must be freed. + */ +static char *hex_representation(unsigned char *bytes, size_t size) +{ + const char *hex_digits = "0123456789abcdef"; + char *str; + int i; + + MALLOC(str, 2 * size + 1, return NULL); + + for (i=0; i < size; i++) { + str[2 * i] = hex_digits[bytes[i] >> 4]; + str[2 * i + 1] = hex_digits[bytes[i] & 0x0f]; + } + + str[2 * size] = '\0'; + + return str; +} /** Get the md5 sum of file. * @param filename name of the file @@ -927,29 +950,17 @@ static const char *hex_digits = "0123456789abcdef"; char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; - char *md5sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(md5sum, (size_t)33, return NULL); - /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); if(ret > 0) { - free(md5sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 16; 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; + return hex_representation(output, 16); } /** Get the sha256 sum of file. @@ -960,30 +971,18 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char SYMEXPORT *alpm_compute_sha256sum(const char *filename) { unsigned char output[32]; - char *sha256sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); if(ret > 0) { - free(sha256sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 32; 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; + return hex_representation(output, 32); } /** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. -- 1.7.8

2 1

[pacman-dev] [PATCH] Add note to HACKING about operator spacing
by Dan McGee 21 Dec '11

21 Dec '11

--- HACKING | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/HACKING b/HACKING index 6692f7e..adfa94b 100644 --- a/HACKING +++ b/HACKING @@ -90,6 +90,17 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT if(!strcmp(a, b)) +8. Use spaces around almost all arithmetic, comparison and assignment + operators and after all ',;:' separators. + + foobar[2 * size + 1] = function(a, 6); + NOT + foobar[2*size+1]=function(a,6); + + for(a = 0; a < n, n > 0; a++) {} + NOT + for(a=0;a<n,n>0;a++) {} + Other Concerns -------------- -- 1.7.8

3 2

[pacman-dev] [PATCH] include config.h via Makefiles
by Dave Reisner 21 Dec '11

21 Dec '11

Ensures that config.h is always ordered correctly (first) in the includes. Also means that new source files get this for free without having to remember to add it. We opt for -imacros over -include as its more portable, and the added constraint by -imacros doesn't bother us for config.h. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Note that when I say "portable", I mean gcc, clang, and icc all support the option. I think that covers most of our bases. lib/libalpm/Makefile.am | 3 +++ lib/libalpm/add.c | 2 -- lib/libalpm/alpm.c | 2 -- lib/libalpm/backup.c | 2 -- lib/libalpm/be_local.c | 2 -- lib/libalpm/be_package.c | 2 -- lib/libalpm/be_sync.c | 2 -- lib/libalpm/conflict.c | 2 -- lib/libalpm/db.c | 2 -- lib/libalpm/delta.c | 2 -- lib/libalpm/delta.h | 2 -- lib/libalpm/deps.c | 2 -- lib/libalpm/diskspace.c | 2 -- lib/libalpm/dload.c | 2 -- lib/libalpm/error.c | 2 -- lib/libalpm/graph.c | 2 -- lib/libalpm/graph.h | 2 -- lib/libalpm/group.c | 2 -- lib/libalpm/handle.c | 2 -- lib/libalpm/log.c | 2 -- lib/libalpm/package.c | 2 -- lib/libalpm/package.h | 2 -- lib/libalpm/remove.c | 2 -- lib/libalpm/signing.c | 2 -- lib/libalpm/sync.c | 2 -- lib/libalpm/trans.c | 2 -- lib/libalpm/util.c | 2 -- lib/libalpm/util.h | 2 -- lib/libalpm/version.c | 2 -- src/pacman/Makefile.am | 5 ++++- src/pacman/callback.c | 2 -- src/pacman/conf.c | 2 -- src/pacman/database.c | 2 -- src/pacman/deptest.c | 2 -- src/pacman/package.c | 2 -- src/pacman/pacman.c | 2 -- src/pacman/query.c | 2 -- src/pacman/remove.c | 2 -- src/pacman/sync.c | 2 -- src/pacman/upgrade.c | 2 -- src/pacman/util.c | 2 -- src/util/Makefile.am | 5 ++++- src/util/cleanupdelta.c | 2 -- src/util/pacsort.c | 2 -- src/util/pactree.c | 2 -- src/util/testdb.c | 2 -- 46 files changed, 11 insertions(+), 88 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 99f9c1b..61dcb87 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -7,6 +7,9 @@ include_HEADERS = alpm_list.h alpm.h DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@ +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h + AM_CFLAGS = -pedantic -D_GNU_SOURCE if ENABLE_VISIBILITY_CC diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 78615bb..014990d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <errno.h> #include <string.h> diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index e957f1a..3f7ab4b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 728c1d0..68856de 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 606f9e1..2deef22 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <unistd.h> #include <stdio.h> #include <stdlib.h> diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4f530e0..41ecc75 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 54c4f87..abc4a99 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5703aba..b5c55dc 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 7708d18..3e53435 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 6315a85..5346716 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <stdint.h> /* intmax_t */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 05df420..42353f5 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -20,8 +20,6 @@ #ifndef _ALPM_DELTA_H #define _ALPM_DELTA_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm.h" diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 9f7e902..9d7e547 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -20,8 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index cfd6402..274aa67 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #if defined(HAVE_MNTENT_H) #include <mntent.h> diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index bcbc809..a3980d6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <errno.h> diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 044dec7..528a3dc 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 3a7f24b..d080e05 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include "graph.h" #include "util.h" #include "log.h" diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index d4d134b..2910b7d 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -19,8 +19,6 @@ #ifndef _ALPM_GRAPH_H #define _ALPM_GRAPH_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm_list.h" diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 47458df..8b407b2 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 01f5955..6518b7d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -20,8 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 692ff79..14b454e 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdarg.h> #include <errno.h> diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e96177a..68fec16 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <sys/types.h> diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 82a8326..172d2f3 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -24,8 +24,6 @@ #ifndef _ALPM_PACKAGE_H #define _ALPM_PACKAGE_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d7e06bc..8967eff 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <errno.h> #include <string.h> diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 0bef445..fbb6b13 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3817ec8..b10f3e8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <sys/types.h> /* off_t */ #include <stdlib.h> #include <stdio.h> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index cb97a4a..5ceaaa7 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..b2974a4 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <unistd.h> #include <ctype.h> diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 1e19274..54e69c1 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -24,8 +24,6 @@ #ifndef _ALPM_UTIL_H #define _ALPM_UTIL_H -#include "config.h" - #include "alpm_list.h" #include "alpm.h" #include "package.h" /* alpm_pkg_t */ diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 6b65a41..a88b818 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -15,8 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <string.h> #include <ctype.h> diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 3790bdf..795b2d1 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -17,7 +17,10 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" \ @DEFS@ -INCLUDES = -I$(top_srcdir)/lib/libalpm + +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h \ + -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c118940..87ba30a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 482a86d..6703243 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <glob.h> #include <limits.h> diff --git a/src/pacman/database.c b/src/pacman/database.c index 3e4a672..b973661 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <alpm.h> diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 0bf9cd8..63e7985 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <alpm.h> diff --git a/src/pacman/package.c b/src/pacman/package.c index d4bbf88..233e8e2 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d2fa62f..3e17d90 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - /* special handling of package version for GIT */ #if defined(GIT_VERSION) #undef PACKAGE_VERSION diff --git a/src/pacman/query.c b/src/pacman/query.c index 4c2ea81..66813e3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <stdint.h> diff --git a/src/pacman/remove.c b/src/pacman/remove.c index b6da7c3..3de5769 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <fnmatch.h> #include <stdlib.h> #include <stdio.h> diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 9015b08..a13b6c7 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 650af6b..87f7c39 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/src/pacman/util.c b/src/pacman/util.c index 12f3dca..7846291 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e4af56c..57ba639 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -11,7 +11,10 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DDBPATH=\"$(dbpath)\" \ -DCACHEDIR=\"$(cachedir)\" \ @DEFS@ -INCLUDES = -I$(top_srcdir)/lib/libalpm + +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h + -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index d6bd0e8..ea34fe7 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 0eedf59..7275cc7 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <getopt.h> #include <stdio.h> diff --git a/src/util/pactree.c b/src/util/pactree.c index f95c5e8..55d63d7 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <ctype.h> #include <getopt.h> #include <stdio.h> diff --git a/src/util/testdb.c b/src/util/testdb.c index b15bbe5..4f6bfed 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- 1.7.8

2 2

[pacman-dev] [PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum().
by Diogo Sousa 21 Dec '11

21 Dec '11

Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/util.c | 56 ++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..2fe6087 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,7 +917,30 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif -static const char *hex_digits = "0123456789abcdef"; +/** Create a string representing bytes in hexadecimal. + * + * @param bytes the bytes to represent in hexadecimal. + * @param size number of bytes to consider. + * @return a nul terminated string with the hexadecimal representation + * of bytes or NULL on error. This string must be freed. + */ +static char *hex_representation(unsigned char *bytes, size_t size) +{ + static const char *hex_digits = "0123456789abcdef"; + char *str; + int i; + + MALLOC(str, 2*size+1, return NULL); + + for (i=0; i < size; i++) { + str[2*i] = hex_digits[bytes[i] >> 4]; + str[2*i+1] = hex_digits[bytes[i] & 0x0f]; + } + + str[2*size] = '\0'; + + return str; +} /** Get the md5 sum of file. * @param filename name of the file @@ -927,29 +950,17 @@ static const char *hex_digits = "0123456789abcdef"; char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; - char *md5sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(md5sum, (size_t)33, return NULL); - /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); if(ret > 0) { - free(md5sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 16; 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; + return hex_representation(output,16); } /** Get the sha256 sum of file. @@ -960,29 +971,18 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char SYMEXPORT *alpm_compute_sha256sum(const char *filename) { unsigned char output[32]; - char *sha256sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); if(ret > 0) { - free(sha256sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 32; 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; + return hex_representation(output,32); } /** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. -- 1.7.8

2 2

[pacman-dev] [PATCH] Don't check diskspace when using --dbonly
by Dan McGee 21 Dec '11

21 Dec '11

Mostly a waste of time. Sure, we no longer make sure your pacman database partition has enough space, but if you are using this option you better know what you are doing anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 534499a..0c6ec9e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1180,7 +1180,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) } /* check available disk space */ - if(handle->checkspace) { + if(handle->checkspace && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { EVENT(handle, ALPM_EVENT_DISKSPACE_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n"); -- 1.7.8

1 0

[pacman-dev] [PATCH 1/3] contrib/*: Hardcode program names
by Lukas Fleischer 13 Dec '11

13 Dec '11

Add a read-only variable "$myname" to every contrib script and hardcode program names instead of relying on "$0". The variable name "$myname" was chosen because it is already used in pacman and because we use "$myver" to specify the program version in the official scripts. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- contrib/bacman.in | 14 +++++++------- contrib/paccache.in | 6 ++++-- contrib/pacdiff.in | 10 ++++++---- contrib/paclist.in | 8 +++++--- contrib/paclog-pkglist.in | 6 ++++-- contrib/pacscripts.in | 10 +++++----- contrib/pacsearch.in | 10 +++++----- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index c55d716..00d0691 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -23,7 +23,7 @@ shopt -s extglob shopt -s nullglob -readonly progname="bacman" +declare -r myname='bacman' readonly progver="0.2.1" # @@ -31,8 +31,8 @@ readonly progver="0.2.1" # usage() { echo "This program recreates a package using pacman's db and system files" - echo "Usage: $progname <installed package name>" - echo "Example: $progname kernel26" + echo "Usage: $myname <installed package name>" + echo "Example: $myname kernel26" } if (( $# != 1 )); then @@ -46,7 +46,7 @@ if [[ $1 == "--help" || $1 == "-h" ]]; then fi if [[ $1 == "--version" || $1 == "-v" ]]; then - echo "$progname version $progver" + echo "$myname version $progver" echo "Copyright (C) 2008 locci" exit 0 fi @@ -61,7 +61,7 @@ if (( EUID )); then /usr/bin/fakeroot -u -- "$0" "$@" exit $? else - echo "WARNING: installing fakeroot or running ${progname} as root is required to" + echo "WARNING: installing fakeroot or running $myname as root is required to" echo " preserve the ownership permissions of files in some packages" echo "" fi @@ -151,7 +151,7 @@ while read i; do echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then" - echo " you will need to run $progname as root" + echo " you will need to run $myname as root" rm -rf "$work_dir" exit 1 fi @@ -177,7 +177,7 @@ pkg_size=$(du -sk | awk '{print $1 * 1024}') # TODO adopt makepkg's write_pkginfo() into this or scripts/library # echo Generating .PKGINFO metadata... -echo "# Generated by $progname $progver" > .PKGINFO +echo "# Generated by $myname $progver" > .PKGINFO if [[ $INFAKEROOT == "1" ]]; then echo "# Using $(fakeroot -v)" >> .PKGINFO fi diff --git a/contrib/paccache.in b/contrib/paccache.in index eae547d..847d44f 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -20,6 +20,8 @@ shopt -s extglob +declare -r myname='paccache' + declare -a candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= @@ -174,9 +176,9 @@ summarize() { usage() { cat <<EOF -usage: ${0##*/} <operation> [options] [targets...] +usage: $myname <operation> [options] [targets...] -${0##*/} is a flexible pacman cache cleaning utility, which has numerous +$myname is a flexible pacman cache cleaning utility, which has numerous options to help control how much, and what, is deleted from any directory containing pacman package tarballs. diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 3f26f38..79cf809 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -17,17 +17,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +declare -r myname='pacdiff' + diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 usage() { - echo "pacdiff : a simple pacnew/pacorig/pacsave updater" - echo "Usage : pacdiff [-l]" - echo " -l/--locate makes pacdiff use locate rather than find" + echo "$myname : a simple pacnew/pacorig/pacsave updater" + echo "Usage : $myname [-l]" + echo " -l/--locate makes $myname use locate rather than find" echo " DIFFPROG variable allows to override the default vimdiff" echo " DIFFSEARCHPATH allows to override the default /etc path" - echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff" + echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" $myname" } cmd() { diff --git a/contrib/paclist.in b/contrib/paclist.in index 06b06f2..8623049 100755 --- a/contrib/paclist.in +++ b/contrib/paclist.in @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +declare -r myname='paclist' + export TEXTDOMAIN='pacman' export TEXTDOMAINDIR='/usr/share/locale' @@ -28,9 +30,9 @@ if ! type gettext &>/dev/null; then fi if [[ -z $1 || $1 = -@(h|-help) ]]; then - printf '%s - List all packages installed from a given repo\n' "${0##*/}" - printf 'Usage: %s <repo>\n' "${0##*/}" - printf 'Example: %s testing\n' "${0##*/}" + printf '%s - List all packages installed from a given repo\n' "$myname" + printf 'Usage: %s <repo>\n' "$myname" + printf 'Example: %s testing\n' "$myname" exit 1 fi diff --git a/contrib/paclog-pkglist.in b/contrib/paclog-pkglist.in index 27dfd30..0b27bf3 100755 --- a/contrib/paclog-pkglist.in +++ b/contrib/paclog-pkglist.in @@ -17,14 +17,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +declare -r myname='paclog-pkglist' + export TEXTDOMAIN='pacman' export TEXTDOMAINDIR='/usr/share/locale' declare logfile=${1:-@localstatedir@/log/pacman.log} if [[ $1 ]]; then if [[ $1 = -@(h|-help) ]]; then - printf 'usage: %s [pacman log]\n' "${0##*/}" - printf 'example: %s @localstatedir@/log/pacman.log\n' "${0##*/}" + printf 'usage: %s [pacman log]\n' "$myname" + printf 'example: %s @localstatedir@/log/pacman.log\n' "$myname" printf '\ndefaults to: @localstatedir@/log/pacman.log\n' exit 0 elif [[ ! -e $logfile ]]; then diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 37d3fea..967f782 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -24,7 +24,7 @@ set -o nounset set -o errexit -progname=$(basename $0) +declare -r myname='pacscripts' progver="0.4" conf="@sysconfdir@/pacman.conf" @@ -47,14 +47,14 @@ error() { usage() { echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts" echo "of a given package." - echo "Usage: $progname pkgname|pkgfile" + echo "Usage: $myname pkgname|pkgfile" echo echo " OPTIONS:" echo " -h, --help Print this help message" echo " -v, --version Print program name and version" echo - echo "Example: $progname gconf-editor" - echo "Example: $progname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" + echo "Example: $myname gconf-editor" + echo "Example: $myname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" } spacman() { @@ -127,6 +127,6 @@ fi case "$1" in --help|-h) usage; exit 0 ;; - --version|-v) echo "$progname version $progver"; exit 0 ;; + --version|-v) echo "$myname version $progver"; exit 0 ;; *) print_scriptlet $1 ;; esac diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index db9d6ad..794110e 100755 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -24,13 +24,13 @@ use strict; use warnings; -my $progname = "pacsearch"; +my $myname = 'pacsearch'; my $version = "2.0"; if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { - print "$progname - Add color and install information to a pacman -Ss search\n"; - print "Usage: $progname <pattern>\n"; - print "Example: $progname ^gnome\n"; + print "$myname - Add color and install information to a pacman -Ss search\n"; + print "Usage: $myname <pattern>\n"; + print "Example: $myname ^gnome\n"; if ($#ARGV lt 0) { exit 1; } @@ -38,7 +38,7 @@ if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { } if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") { - print "$progname version $version\n"; + print "$myname version $version\n"; print "Copyright (C) 2006-2011 Dan McGee\n"; exit 0; } -- 1.7.8

3 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-84-g2a4df07
by dan＠archlinux.org 12 Dec '11

12 Dec '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 2a4df070c360bfe31d99e232b75bdea06949245f (commit) via 370c873be54a6ef74f86b5e77ff722f766ebf707 (commit) via 8c8f04371745dad0bafcea14b38b4570e0b24a31 (commit) via 67290441b80fa813a472767353095425c78805af (commit) via 3d4656c0204956847a62c95b0f28747d7a0c2c05 (commit) via b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (commit) via 5f0df423033c94e8ae52ca642284bf6a50fa9bbb (commit) via 1a1f5540a4533ea41038128026c75fe023410a99 (commit) via 074cf4cb951b85b95e706df77b8bf01cbd84d35f (commit) via 62fa0c7d8d8cbb449e1e014eacd895011685a093 (commit) via 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de (commit) via dacda1f6b3f2122d7d54cda9ed7d620301595ef1 (commit) from b5225165c070b30f8ec5a71ff5a12ea43102c3da (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 2a4df070c360bfe31d99e232b75bdea06949245f Merge: 370c873 6729044 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 14:07:44 2011 -0600 Merge branch 'maint' commit 370c873be54a6ef74f86b5e77ff722f766ebf707 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 13:05:10 2011 -0600 Calculate root length only once when checking for file conflicts It is quite easy to hoist this potentially repeated computation out of the loop; even if we don't end up using it, it is super cheap to do it only once. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8c8f04371745dad0bafcea14b38b4570e0b24a31 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 13 18:19:28 2011 -0500 lib/conflict: save strlen call by reusing snprintf return The return should probably be checked to ensure its not longer than PATH_MAX, but I have no idea what the correct behavior is when that happens. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d4656c0204956847a62c95b0f28747d7a0c2c05 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 6 23:37:32 2011 -0500 code syntax cleanup As per HACKING file, we use 'CTRL(' rather than 'CTRL (' Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f0df423033c94e8ae52ca642284bf6a50fa9bbb Author: Dave Reisner <d(a)falconindy.com> Date: Sat Dec 10 23:10:49 2011 -0500 makepkg: split source elements when looking for sigs Allows renamed .asc/.sig files to be still discovered by makepkg. This is needed for a package such as PuTTY, which provides abnormally named sig files (.DSA and .RSA) which are valid input for gpg --verify. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1a1f5540a4533ea41038128026c75fe023410a99 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 10:53:14 2011 -0600 pacman: process all sync targets before exiting on error If someone specifies a bogus line such as pacman -S baz adsf/boo base-devel we are better off trying to process all targets and showing all relevant errors before exiting. This is easier in -U and -R operations where we aren't dealing with groups, but here we attempt to skip group selection once we know a target has errored to avoid cluttering the output and hiding the real problem. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 074cf4cb951b85b95e706df77b8bf01cbd84d35f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 10:50:27 2011 -0600 pacman: process all targets on upgrade operation If an early target fails, we stopped processing the rest of the list. We should continue all the way through and show relevant errors for each target if possible, and error out only at the end. We do process all targets to check for URLs first and will error out if some could not be processed; we then do a second loop and try to load each target specified on the command line. This mirrors a patch by Allan to do the same for removal operations. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62fa0c7d8d8cbb449e1e014eacd895011685a093 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 10 20:08:24 2011 +1000 pacman: list all unknown targets on removal operation On a removal operation, pacman currently reports an error for the package that is not found in the database and then exists. Adjust so that all unknown packages are reported. Before: > pacman -R foo bar error: 'foo': target not found After: > pacman -R foo bar error: 'foo': target not found error: 'bar': target not found Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 7 12:33:41 2011 -0600 Use automake verbose helpers in custom make rules This converts our script generation to use the built-in AM_V_GEN macro, which honors the V= setting passed to make and allows one to see the full command if they truly desire. The AM_V_at macro is also used in place of an explicit @ so verbose-mode compiles show all commands being run. We can also use these two macros in doc generation to quiet it down to the level we expect. Other minor changes: * a pointless test call is removed in test/pacman/tests/ * sed is used instead of dos2unix as we depend on it anyway * consecutive chmod calls are reduced to a single call (e.g., '+x,a-x') Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dacda1f6b3f2122d7d54cda9ed7d620301595ef1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 8 09:15:41 2011 -0600 Make automake generate silent rules by default This will require you to pass 'V=1' if you want the previous, more verbose output. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- contrib/.gitignore | 1 + contrib/Makefile.am | 24 +++++++++--------- contrib/paccache.in | 2 +- contrib/pacsysclean.in | 50 +++++++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 16 +++++++----- etc/Makefile.am | 7 ++--- lib/libalpm/conflict.c | 13 ++++++---- lib/libalpm/deps.c | 2 +- lib/libalpm/util.c | 26 ++++++++++---------- scripts/Makefile.am | 10 ++----- scripts/makepkg.sh.in | 4 +- src/pacman/callback.c | 4 +- src/pacman/conf.c | 8 +++--- src/pacman/pacman.c | 2 +- src/pacman/remove.c | 5 +++- src/pacman/sync.c | 40 ++++++++++++++++++++++---------- src/pacman/upgrade.c | 20 ++++++++++++---- src/pacman/util.c | 6 ++-- test/pacman/tests/Makefile.am | 10 +++----- 20 files changed, 165 insertions(+), 88 deletions(-) create mode 100755 contrib/pacsysclean.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-11-g6729044
by dan＠archlinux.org 12 Dec '11

12 Dec '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 67290441b80fa813a472767353095425c78805af (commit) from b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/paccache.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, maint, updated. v4.0.1-10-gb75fac5
by dan＠archlinux.org 12 Dec '11

12 Dec '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 b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (commit) from 6a1d3948a670184f01a697efe55b91b4ccdcb51d (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 b75fac5be31d6056e78fd29a0548cc3e6275a1b8 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Nov 21 17:21:24 2011 -0500 pacsysclean: Add new contrib script 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 Dan for fixing and improving my original script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 + contrib/Makefile.am | 5 +++- contrib/pacsysclean.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in hooks/post-receive -- The official pacman repository

1 0