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

[pacman-dev] [PATCH] Skip md5sum check if signature check is successful
by Peter Tseng 26 Mar '11

26 Mar '11

Been sitting on the TODO list for a while, and figured I'd give it a shot. This simply moves the md5sum check to after the signature check, then adds a variable to indicate that signature check was okay. Yes, my first attempt to submit, and it's a simple one, but you gotta start somewhere. If it fails miserably, feel free to tear it apart. I'll respond to feedback and hopefully move on to submit more in the future... Signed-off-by: Peter Tseng <archlinux(a)leftylink.com> --- lib/libalpm/sync.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5428e40..2b1c6cb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -828,6 +828,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) for(i = trans->add; i; i = i->next, current++) { pmpkg_t *spkg = i->data; int percent = (current * 100) / numtargs; + int sig_check_ok = 0; if(spkg->origin == PKG_FROM_FILE) { continue; /* pkg_load() has been already called, this package is valid */ } @@ -839,14 +840,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) const char *md5sum = alpm_pkg_get_md5sum(spkg); const pmpgpsig_t *pgpsig = alpm_pkg_get_pgpsig(spkg); - /* check md5sum first */ - if(test_md5sum(trans, filepath, md5sum) != 0) { - errors++; - *data = alpm_list_add(*data, strdup(filename)); - FREE(filepath); - continue; - } - /* check PGP signature next */ + /* check PGP signature first */ pmdb_t *sdb = alpm_pkg_get_db(spkg); if(sdb->pgp_verify != PM_PGP_VERIFY_NEVER) { @@ -857,8 +851,17 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) *data = alpm_list_add(*data, strdup(filename)); FREE(filepath); continue; + } else { + sig_check_ok = 1; } } + /* check md5sum next */ + if(!sig_check_ok && test_md5sum(trans, filepath, md5sum) != 0) { + errors++; + *data = alpm_list_add(*data, strdup(filename)); + FREE(filepath); + continue; + } /* load the package file and replace pkgcache entry with it in the target list */ /* TODO: alpm_pkg_get_db() will not work on this target anymore */ _alpm_log(PM_LOG_DEBUG, "replacing pkgcache entry with package file for target %s\n", spkg->name); -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Update usage instruction strings
by Dan McGee 25 Mar '11

25 Mar '11

* Address FS#23433 by documenting -d vs. -dd * Drop the useless "as well", "also", "too", and "that won't break packages" strings from -R usage * Fix alignment of multiline strings in source (no string change) Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 2847fd5..0ad0354 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -114,6 +114,7 @@ static void usage(int op, const char * const myname) char const * const str_usg = _("usage"); char const * const str_opr = _("operation"); + /* please limit your strings to 80 characters in width */ if(op == PM_OP_MAIN) { printf("%s: %s <%s> [...]\n", str_usg, myname, str_opr); printf(_("operations:\n")); @@ -132,10 +133,10 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); addlist(_(" -c, --cascade remove packages and all packages that depend on them\n")); - addlist(_(" -n, --nosave remove configuration files as well\n")); - addlist(_(" -s, --recursive remove dependencies also (that won't break packages)\n" - " (-ss includes explicitly installed dependencies too)\n")); - addlist(_(" -u, --unneeded remove unneeded packages (that won't break packages)\n")); + addlist(_(" -n, --nosave remove configuration files\n")); + addlist(_(" -s, --recursive remove unnecessary dependencies\n" + " (-ss includes explicitly installed dependencies)\n")); + addlist(_(" -u, --unneeded remove unneeded packages\n")); } else if(op == PM_OP_UPGRADE) { printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); @@ -186,16 +187,16 @@ static void usage(int op, const char * const myname) addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" - " ignore a group upgrade (can be used more than once)\n")); + " ignore a group upgrade (can be used more than once)\n")); /* pass through */ case PM_OP_REMOVE: - addlist(_(" -d, --nodeps skip dependency checks\n")); + addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" -k, --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); - addlist(_(" --print only print the targets instead of performing the operation\n")); + addlist(_(" --print print the targets instead of performing the operation\n")); addlist(_(" --print-format <string>\n" - " specify how the targets should be printed\n")); + " specify how the targets should be printed\n")); break; } -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Make log redirection saner
by Jan Steffens 25 Mar '11

25 Mar '11

My main motivation was to remove the "sync", which can stall for minutes on a busy machine (FS#23378). I also cleaned up the redirection. Signed-off-by: Jan Steffens <jan.steffens(a)gmail.com> --- scripts/makepkg.sh.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5742c49..0b3891e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -794,15 +794,14 @@ run_function() { # ensure overridden package variables survive tee with split packages logpipe=$(mktemp -u "$startdir/logpipe.XXXXXXXX") mkfifo "$logpipe" - exec 3>&1 - tee "$BUILDLOG" < "$logpipe" & - exec 1>"$logpipe" 2>"$logpipe" + tee "$BUILDLOG" < "$logpipe" & teepid=$! + restoretrap=$(trap -p ERR) trap 'error_function $pkgfunc' ERR - $pkgfunc 2>&1 + $pkgfunc &>"$logpipe" eval $restoretrap - sync - exec 1>&3 2>&3 3>&- + + wait $teepid rm "$logpipe" else restoretrap=$(trap -p ERR) -- 1.7.4.1

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-71-g86e7f60
by dan＠archlinux.org 25 Mar '11

25 Mar '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 86e7f6075671e08c456f389d8ecba47190c03f0f (commit) via c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (commit) via 14474a32c90b2202f1faf69ea20abbcdedfe4c29 (commit) via e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b (commit) via cfa2eebdafc4d2341621e24ce61dd5a74a0de9fc (commit) via 351942c71b80adaac614ed1c353d0e8e6f49ac8b (commit) from a8b22e16efbffee84ff8647846196958d871c64b (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 86e7f6075671e08c456f389d8ecba47190c03f0f Merge: cfa2eeb c37c9c5 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 24 21:18:09 2011 -0500 Merge branch 'maint' commit cfa2eebdafc4d2341621e24ce61dd5a74a0de9fc Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 24 18:05:30 2011 -0400 Fix use of relative paths for packages in repo-add Move checksum and pgpsig calcluation before changing into the tmpdir, otherwise we can't find the files if a relative path was used. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 1 + lib/libalpm/alpm.c | 9 +++++++++ lib/libalpm/db.c | 8 ++------ scripts/makepkg.sh.in | 10 +++++----- scripts/repo-add.sh.in | 31 +++++++++++++++++-------------- src/pacman/pacman.c | 4 ++++ 6 files changed, 38 insertions(+), 25 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-3-gc37c9c5
by dan＠archlinux.org 25 Mar '11

25 Mar '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 c37c9c5dcae06c1585b4da4c0b838f5b44e1498e (commit) via 14474a32c90b2202f1faf69ea20abbcdedfe4c29 (commit) via e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b (commit) from 351942c71b80adaac614ed1c353d0e8e6f49ac8b (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 c37c9c5dcae06c1585b4da4c0b838f5b44e1498e Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 24 22:00:35 2011 -0400 Add -T, --deptest to usage message Fixes FS #23369 Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14474a32c90b2202f1faf69ea20abbcdedfe4c29 Author: Jan Steffens <jan.steffens(a)gmail.com> Date: Thu Mar 24 13:30:15 2011 +0100 Make log redirection saner My main motivation was to remove the "sync", which can stall for minutes on a busy machine (FS#23378). I also cleaned up the redirection. Signed-off-by: Jan Steffens <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e68e994eb2c32c4b7ad5288f8f4b8809e1c39c9b Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 24 15:10:01 2011 -0400 alpm/db: do not close local DB in alpm_db_unregister_all pacman 3.5.0 removed alpm_db_register_local, so calling alpm_db_unregister_all leaves the front end in a position where there's no local db, and no way to re-register it. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.c | 9 +++++++++ lib/libalpm/db.c | 8 ++------ scripts/makepkg.sh.in | 10 +++++----- src/pacman/pacman.c | 4 ++++ 4 files changed, 20 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add -T, --deptest to usage message
by Ray Kohler 25 Mar '11

25 Mar '11

Fixes FS #23369 Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- src/pacman/pacman.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 0487ee8..d10cefe 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -123,6 +123,7 @@ static void usage(int op, const char * const myname) printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-T --deptest} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); printf(_("\nuse '%s {-h --help}' with an operation for available options\n"), myname); -- 1.7.4.1

2 2

[pacman-dev] [PATCH] Fix use of relative paths for packages in repo-add
by Ray Kohler 24 Mar '11

24 Mar '11

I first noticed that checksums weren't calculated if a relative path was used, since they're done after moving into the $tmpdir and relative paths become useless. Then I saw that PGP sigs had basically the same problem, with the addition of the introduction of $startdir, which was never set beforehand (cut-n-paste from makepkg?). Seeing that having this value known would solve both problems, I just defined it and used it for the checksums as well. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/repo-add.sh.in | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 59e98cf..0461c7a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -235,7 +235,8 @@ db_write_entry() # blank out all variables local pkgfile="$1" local pkgname pkgver pkgdesc csize size md5sum url arch builddate packager \ - _groups _licenses _replaces _depends _conflicts _provides _optdepends + startdir _groups _licenses _replaces _depends _conflicts _provides \ + _optdepends local OLDIFS="$IFS" # IFS (field separator) is only the newline character @@ -271,6 +272,8 @@ db_write_entry() return 1 fi + startdir=$(pwd) + pushd "$tmpdir" >/dev/null if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" @@ -286,9 +289,9 @@ db_write_entry() # compute checksums msg2 "$(gettext "Computing checksums...")" - md5sum="$(openssl dgst -md5 "$pkgfile")" + md5sum="$(openssl dgst -md5 "$startdir/$pkgfile")" md5sum="${md5sum##* }" - sha256sum="$(openssl dgst -sha256 "$pkgfile")" + sha256sum="$(openssl dgst -sha256 "$startdir/$pkgfile")" sha256sum="${sha256sum##* }" # remove an existing entry if it exists, ignore failures @@ -317,7 +320,7 @@ db_write_entry() echo -e "%SHA256SUM%\n$sha256sum\n" >>desc # add base64'd PGP signature - if [[ -f $startdir/$pkgfile.sig ]]; then + if [[ -f "$startdir/$pkgfile.sig" ]]; then pgpsig=$(openssl base64 -in "$startdir/$pkgfile.sig" | tr -d '\n') echo -e "%PGPSIG%\n$pgpsig\n" >>desc fi -- 1.7.4.1

2 3

[pacman-dev] [RFC] Proposed fix for FS#20538
by Dave Reisner 24 Mar '11

24 Mar '11

https://bugs.archlinux.org/task/20538 The attached patch flushes the terminal input buffer shortly before prompting users for input to answer a question. On the one hand, I can see how this might be nice when you accidentally hit <enter> twice, or fat finger a key during a download and press <enter> at the prompt only to be oddly returned to your shell. On the other hand, I've occasionally abused this exact behavior to walk away from my computer in the middle of a large -Syu. Thoughts? Any issues with the code approach? dave

2 2

[pacman-dev] [PATCH 1/3] Add --with-bsdtar-bin configure option
by Nezmer 24 Mar '11

24 Mar '11

This will enable us to use a custom name and/or location of bsdtar binary in scripts. Signed-off-by: Nezmer <git(a)nezmer.info> --- configure.ac | 6 ++++++ contrib/Makefile.am | 1 + contrib/bacman.in | 4 ++-- contrib/pacscripts.in | 4 ++-- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 12 ++++++------ scripts/pacman-optimize.sh.in | 4 ++-- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 14 +++++++------- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..50d4a04 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,11 @@ AC_ARG_WITH(fetch, AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]), [], [with_fetch=check]) +# Custom bsdtar binary name and/or location +AC_ARG_WITH(bsdtar_bin, + AS_HELP_STRING([--with-bsdtar-bin=BSDTAR], [use bsdtar_bin as the bsdtar binary in scripts]), + BSDTAR_BIN=$with_bsdtar_bin) + # Help line for documentation AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), @@ -128,6 +133,7 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false]) +AC_PATH_PROGS([BSDTAR_BIN], [bsdtar], [false]) # find installed gettext AM_GNU_GETTEXT([external]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 55366b4..985b19f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ MOSTLYCLEANFILES = $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@BSDTAR_BIN[@]|$(BSDTAR_BIN)|g' \ -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' $(OURFILES): Makefile diff --git a/contrib/bacman.in b/contrib/bacman.in index b4e3b4b..1891ef6 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -133,7 +133,7 @@ while read i; do %FILES%) ret=0 if [ -e "/$i" ]; then - bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - + @BSDTAR_BIN@ -cnf - "/$i" 2> /dev/null | @BSDTAR_BIN@ -xpf - # Workaround to bsdtar not reporting a missing file as an error if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then @@ -288,7 +288,7 @@ ret=0 shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail -bsdtar -cf - $comp_files * | +@BSDTAR_BIN@ -cf - $comp_files * | case "$PKGEXT" in *tar.gz) gzip -c -f -n ;; *tar.bz2) bzip2 -c -f ;; diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index d366409..6faf964 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -85,7 +85,7 @@ print_db() { } print_pkg() { - if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + if ! @BSDTAR_BIN@ -xOf "$1" .INSTALL 2>/dev/null; then error "Package $1 does not include any .INSTALL script" return 1 fi @@ -94,7 +94,7 @@ print_pkg() { print_scriptlet() { if [ -f "$1" ]; then - if bsdtar tf "$1" .PKGINFO &>/dev/null; then + if @BSDTAR_BIN@ tf "$1" .PKGINFO &>/dev/null; then print_pkg "$1" return fi diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 78deb0b..4668ad1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@BSDTAR_BIN[@]|$(BSDTAR_BIN)|g' \ -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bdf63ef..2731dbf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -671,7 +671,7 @@ extract_sources() { local cmd='' case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar" ;; + cmd="@BSDTAR_BIN@" ;; *application/x-gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; @@ -689,8 +689,8 @@ extract_sources() { esac ;; *) # See if bsdtar can recognize the file - if bsdtar -tf "$file" -q '*' &>/dev/null; then - cmd="bsdtar" + if @BSDTAR_BIN@ -tf "$file" -q '*' &>/dev/null; then + cmd="@BSDTAR_BIN@" else continue fi ;; @@ -698,7 +698,7 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" - if [[ $cmd = bsdtar ]]; then + if [[ $cmd = @BSDTAR_BIN@ ]]; then $cmd -xf "$file" || ret=$? else rm -f "${file%.*}" @@ -1043,7 +1043,7 @@ create_package() { shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail - bsdtar -cf - $comp_files * | + @BSDTAR_BIN@ -cf - $comp_files * | case "$PKGEXT" in *tar.gz) gzip -c -f -n ;; *tar.bz2) bzip2 -c -f ;; @@ -1135,7 +1135,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + if ! @BSDTAR_BIN@ -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index f4642ab..a0026b7 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -129,7 +129,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +@BSDTAR_BIN@ -czf "$workdir/pacman-db.tar.gz" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" @@ -138,7 +138,7 @@ fi # step 3: make and sum the new db side-by-side with the old msg "$(gettext "Making and MD5sum'ing the new database...")" mkdir "$dbroot.new" -bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" +@BSDTAR_BIN@ -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Untar'ing %s failed.")" "$dbroot" diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 6bc3f5d..b569ea4 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -76,7 +76,7 @@ read_pkginfo() IFS=" " local line var val - for line in $(bsdtar -xOf "$1" .PKGINFO 2>/dev/null | + for line in $(@BSDTAR_BIN@ -xOf "$1" .PKGINFO 2>/dev/null | grep -v "^#" | sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do eval "$line" if [[ -n $pkgname && -n $pkgver && -n $arch ]]; then diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d09d1b4..8b6a028 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -198,7 +198,7 @@ db_write_entry() # read info from the zipped package local line var val - for line in $(bsdtar -xOqf "$pkgfile" .PKGINFO | + for line in $(@BSDTAR_BIN@ -xOqf "$pkgfile" .PKGINFO | grep -v '^#' | sed 's|$\w*$\s*=\s*$.*$|\1 \2|'); do # bash awesomeness here- var is always one word, val is everything else var=${line%% *} @@ -337,15 +337,15 @@ check_repo_db() if [[ -f $REPO_DB_FILE ]]; then # there are two situations we can have here- a DB with some entries, # or a DB with no contents at all. - if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then + if ! @BSDTAR_BIN@ -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then # check empty case - if [[ -n $(bsdtar -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then + if [[ -n $(@BSDTAR_BIN@ -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi fi msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir" + @BSDTAR_BIN@ -xf "$REPO_DB_FILE" -C "$tmpdir" else case "$cmd" in repo-remove) @@ -386,7 +386,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then + if ! @BSDTAR_BIN@ -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi @@ -505,11 +505,11 @@ if (( success )); then cd "$tmpdir" if [[ -n $(ls) ]]; then - bsdtar -c${TAR_OPT}f "$filename" * + @BSDTAR_BIN@ -c${TAR_OPT}f "$filename" * else # we have no packages remaining? zip up some emptyness warning "$(gettext "No packages remain, creating empty database.")" - bsdtar -c${TAR_OPT}f "$filename" -T /dev/null + @BSDTAR_BIN@ -c${TAR_OPT}f "$filename" -T /dev/null fi cd "$startdir" -- 1.7.3.1

2 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.0-98-ga8b22e1
by dan＠archlinux.org 24 Mar '11

24 Mar '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 a8b22e16efbffee84ff8647846196958d871c64b (commit) via 38da050f31fad7fd9252cced698a66c3e3729d98 (commit) via 9a3325a56db87cc8c6336225162daefcd190208f (commit) via ed6fda2f98bdcde56a67e43a6bcf644c549892a2 (commit) via ef26c445245d0d25dfbca8f6feb590d3288d76d4 (commit) via b9263fb4e1900457c9d5f3cc9e05896653130867 (commit) from 47e41b2023f0d13f213b771db96297968fe0f280 (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 a8b22e16efbffee84ff8647846196958d871c64b Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 24 17:22:32 2010 +1000 Do not reuse old signature After updating a database, remove the old signature to prevent it being used in validation if the new signature fails to download. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 38da050f31fad7fd9252cced698a66c3e3729d98 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 22 16:06:16 2010 +1000 Download and verify package database signatures If signature verification is needed, attempt to download a signature file for a repo when it is updated. Return an error if unable to download signature only when checking is mandatory, or if signature is invalid. TODO: At the moment the database signature is only checked on download. Should we do anything with a database if it fails to be verified to prevent its future usage? Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a3325a56db87cc8c6336225162daefcd190208f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 23 22:56:54 2011 -0500 Refactor signature loading code into common function We can use this for both standalone package signatures as well as standalone database signatures. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed6fda2f98bdcde56a67e43a6bcf644c549892a2 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 22 15:06:09 2010 +1000 Add functions for verifying database signature Add a pmpgpsig_t struct to the database entry struct and functions for the lazy loading of database signatures. Add a function for checking database signatures, reusing (and generalizing) the code currently used for checking package signatures. TODO: The code for reading in signature files from the filesystem is duplicated for local packages and database and needs refactoring. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ef26c445245d0d25dfbca8f6feb590d3288d76d4 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Mar 16 22:56:14 2011 -0400 etc/makepkg.conf: use curl in place of wget as a DLAGENT Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9263fb4e1900457c9d5f3cc9e05896653130867 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 09:01:30 2011 -0400 lib/dload.c: Check for dlcb == NULL earlier Our curl callback does a whole lot of work for nothing if the front end never defined a callback to receive the data we'd calculate for it. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 6 +- lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 32 +------------ lib/libalpm/be_sync.c | 51 ++++++++++++++++++--- lib/libalpm/db.c | 29 ++++++++++++ lib/libalpm/db.h | 6 +++ lib/libalpm/dload.c | 22 +++++---- lib/libalpm/package.h | 11 +---- lib/libalpm/signing.c | 113 +++++++++++++++++++++++++++++++++++----------- lib/libalpm/signing.h | 13 +++++- 10 files changed, 198 insertions(+), 86 deletions(-) hooks/post-receive -- The official pacman repository

1 0