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

[pacman-dev] [PATCH] fix vim syntax highlighting of .sh files
by Florian Pritz 30 Jun '11

30 Jun '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- contrib/Makefile.am | 2 +- contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e9f7794..cba2085 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -27,7 +27,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @echo ' ' GEN $@; diff --git a/contrib/bacman.in b/contrib/bacman.in index ebcc386..fe13e5b 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index ac4ce89..3f26f38 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 8ad5173..37d3fea 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e34c300..8491b74 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \ + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..34c3b86 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index fa4cb2b..3e0d702 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 7cdb683..877cca2 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 0dc32bf..5ff302e 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index c8b8a1f..46c6f4f 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 64d5a73..a0ff6d5 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 17b32aa..158c0c1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -- 1.7.6

2 1

[pacman-dev] [PATCH] contrib/paclist: rewrite in bash
by Dave Reisner 30 Jun '11

30 Jun '11

The original concept for this script was a bash implementation, but turned out to be unreasonable at the time due to the efficiencies of the database format. Since those have been resolved, we can rewrite this in bash as a much simpler script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Restore this script it its original intended glory in beautiful bash. I opted for the gettext bindings to preserve pacman error messages. contrib/paclist.in | 83 +++++++++++---------------------------------------- 1 files changed, 18 insertions(+), 65 deletions(-) diff --git a/contrib/paclist.in b/contrib/paclist.in index 0379a4c..f6629e6 100755 --- a/contrib/paclist.in +++ b/contrib/paclist.in @@ -1,7 +1,8 @@ -#!/usr/bin/perl +#!@BASH_SHELL@ # paclist - List all packages installed from a given repo # # Copyright (C) 2008 Dan McGee <dpmcgee(a)gmail.com> +# Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,73 +17,25 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -use strict; -use warnings; +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' -my $progname = "paclist"; -my $version = "1.0"; - -if ($#ARGV != 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { - print "$progname - List all packages installed from a given repo\n"; - print "Usage: $progname <repo>\n"; - print "Example: $progname testing\n"; - if ($#ARGV != 0) { - exit 1; +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" } - exit 0; -} - -if ( $ARGV[0] eq "--version" || $ARGV[0] eq "-v") { - print "$progname version $version\n"; - print "Copyright (C) 2008 Dan McGee\n"; - exit 0; -} - -# This hash table will be used to store pairs of ('name version', count) from -# the return of both pacman -Sl <repo> and pacman -Q output. We then check to -# see if a value was added twice (count = 2)- if so, we will print that package -# as it is both in the repo we queried and installed on our local system. -my %packages = (); -my $output; +fi -$output = `pacman -Sl $ARGV[0]`; -if ($? != 0) { - exit 1; -} -my @sync = split(/\n/, $output); -# sample output from pacman -Sl: -# testing foobar 1.0-1 -foreach $_ (@sync) { - my @info = split(/ /); - # we only want to store 'foobar 1.0-1' in our hash table - my $pkg = $info[1] . " " . $info[2]; - $packages{$pkg}++; -} +if [[ -z $1 ]]; then + printf 'usage: %s <repo>\n' "${0##*/}" + exit 1 +fi -$output = `pacman -Q`; -if ($? != 0) { - exit 1; -} -# sample output from pacman -Q: -# foobar 1.0-1 -my @local = split(/\n/, $output); -foreach $_ (@local) { - # store 'foobar 1.0-1' in our hash table - $packages{$_}++; -} - -# run comparison check- if value was added twice, it was in the intersection -my @intersection; -foreach $_ (keys %packages) { - if ($packages{$_} == 2) { - push @{ \@intersection }, $_; - } -} +printf -v installed '[%s]' "$(gettext installed)" +pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2 }' -# print our intersection, and bask in the glory and speed of perl -@intersection = sort @intersection; -foreach $_ (@intersection) { - print $_ . "\n"; -} +# exit with pacman's return value, not awk's +exit ${PIPESTATUS[0]} -#vim: set noet: +# vim: set ts=2 sw=2 noet: -- 1.7.6

2 4

[pacman-dev] [PATCH 0/3] minor makepkg cleanups
by Dave Reisner 30 Jun '11

30 Jun '11

Just some trivial code cleanups and simplifications I came across looking for other bugs. Dave Reisner (3): makepkg: remove unneeded echo makepkg: fix vim syntax highlighting makepkg: simplify SIGNPKG check scripts/makepkg.sh.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) -- 1.7.6

3 6

[pacman-dev] [PATCH] lib/alpm: unlock the handle before freeing it
by Dave Reisner 30 Jun '11

30 Jun '11

This avoids, probably among other things, leaving the lock file in place after a SIGINT interrupts a sync DB update. Fixes regression introduced in 4f8ae2b. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dan this seems to work (surviving a variety of -Sy and -Syu <pkg> testcases) and pactest doesn't complain, but you know this portion of the code way better than I do. Does this seem sane? lib/libalpm/alpm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index b0bbbe8..d35512b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -117,6 +117,7 @@ int SYMEXPORT alpm_release(pmhandle_t *myhandle) ret = -1; } + _alpm_handle_unlock(myhandle); _alpm_handle_free(myhandle); #ifdef HAVE_LIBCURL -- 1.7.6

1 0

[pacman-dev] [PATCH] move proto files to new subdirectory, proto/
by Dave Reisner 30 Jun '11

30 Jun '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Since we're moving to cleanup the root dir, this seemed like low hanging fruit. Yes Dan, I ran distcheck and it passed. ChangeLog.proto | 16 ---------- Makefile.am | 6 +++- PKGBUILD-split.proto | 70 -------------------------------------------- PKGBUILD.proto | 47 ----------------------------- proto.install | 37 ----------------------- proto/ChangeLog.proto | 16 ++++++++++ proto/PKGBUILD-split.proto | 70 ++++++++++++++++++++++++++++++++++++++++++++ proto/PKGBUILD.proto | 47 +++++++++++++++++++++++++++++ proto/proto.install | 37 +++++++++++++++++++++++ 9 files changed, 175 insertions(+), 171 deletions(-) delete mode 100644 ChangeLog.proto delete mode 100644 PKGBUILD-split.proto delete mode 100644 PKGBUILD.proto delete mode 100644 proto.install create mode 100644 proto/ChangeLog.proto create mode 100644 proto/PKGBUILD-split.proto create mode 100644 proto/PKGBUILD.proto create mode 100644 proto/proto.install diff --git a/ChangeLog.proto b/ChangeLog.proto deleted file mode 100644 index 87e86e7..0000000 --- a/ChangeLog.proto +++ /dev/null @@ -1,16 +0,0 @@ -2007-12-01 Your Name <youremail(a)domain.com> - - * pkgver-pkgrel : - new upstream release. - Reason we changed stuff. - Another reason we changed stuff. - - * gcc-4.1.patch : - Removed, no longer needed. - -2007-11-01 Your Name <youremail(a)domain.com> - - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. diff --git a/Makefile.am b/Makefile.am index dddb751..286e6ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,11 @@ EXTRA_DIST = HACKING # Sample makepkg prototype files pkgdatadir = ${datadir}/${PACKAGE} -dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto +dist_pkgdata_DATA = \ + proto/PKGBUILD.proto \ + proto/PKGBUILD-split.proto \ + proto/proto.install \ + proto/ChangeLog.proto # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto deleted file mode 100644 index 52aacc5..0000000 --- a/PKGBUILD-split.proto +++ /dev/null @@ -1,70 +0,0 @@ -# This is an example of a PKGBUILD for splitting packages. Use this as a -# start to creating your own, and remove these comments. For more information, -# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! -# If it is unknown, then please put 'unknown'. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=('pkg1' 'pkg2') -pkgbase=BASE -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgbase-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package_pkg1() { - # options and directives that can be overridden - pkgver= - pkgrel= - pkgdesc="" - arch=() - license=() - groups=() - depends=() - optdepends=() - provides=() - conflicts=() - replaces=() - backup=() - options=() - install= - changelog= - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 -} - -package_pkg2() { - # options and directives overrides - pkgdesc="" - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 -} diff --git a/PKGBUILD.proto b/PKGBUILD.proto deleted file mode 100644 index 98172d8..0000000 --- a/PKGBUILD.proto +++ /dev/null @@ -1,47 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=($pkgname-$pkgver.tar.gz) -noextract=() -md5sums=() #generate with 'makepkg -g' - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/proto.install b/proto.install deleted file mode 100644 index 2a8993d..0000000 --- a/proto.install +++ /dev/null @@ -1,37 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - -## arg 1: the new package version -#post_install() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#post_upgrade() { - # do something here -#} - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -#post_remove() { - # do something here -#} - -# vim:set ts=2 sw=2 et: diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto new file mode 100644 index 0000000..87e86e7 --- /dev/null +++ b/proto/ChangeLog.proto @@ -0,0 +1,16 @@ +2007-12-01 Your Name <youremail(a)domain.com> + + * pkgver-pkgrel : + new upstream release. + Reason we changed stuff. + Another reason we changed stuff. + + * gcc-4.1.patch : + Removed, no longer needed. + +2007-11-01 Your Name <youremail(a)domain.com> + + * 1.0-5 : + added ChangeLog. + the last line should end with just one newline. + you can cat the file to check it displays fine. diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto new file mode 100644 index 0000000..52aacc5 --- /dev/null +++ b/proto/PKGBUILD-split.proto @@ -0,0 +1,70 @@ +# This is an example of a PKGBUILD for splitting packages. Use this as a +# start to creating your own, and remove these comments. For more information, +# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! +# If it is unknown, then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=('pkg1' 'pkg2') +pkgbase=BASE +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgbase-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgbase-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package_pkg1() { + # options and directives that can be overridden + pkgver= + pkgrel= + pkgdesc="" + arch=() + license=() + groups=() + depends=() + optdepends=() + provides=() + conflicts=() + replaces=() + backup=() + options=() + install= + changelog= + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg1 +} + +package_pkg2() { + # options and directives overrides + pkgdesc="" + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg2 +} diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto new file mode 100644 index 0000000..98172d8 --- /dev/null +++ b/proto/PKGBUILD.proto @@ -0,0 +1,47 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgname-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/proto/proto.install b/proto/proto.install new file mode 100644 index 0000000..2a8993d --- /dev/null +++ b/proto/proto.install @@ -0,0 +1,37 @@ +# This is a default template for a post-install scriptlet. +# Uncomment only required functions and remove any functions +# you don't need (and this header). + +## arg 1: the new package version +#pre_install() { + # do something here +#} + +## arg 1: the new package version +#post_install() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#pre_upgrade() { + # do something here +#} + +## arg 1: the new package version +## arg 2: the old package version +#post_upgrade() { + # do something here +#} + +## arg 1: the old package version +#pre_remove() { + # do something here +#} + +## arg 1: the old package version +#post_remove() { + # do something here +#} + +# vim:set ts=2 sw=2 et: -- 1.7.6

1 0

[pacman-dev] [PATCH] repo-add: fix db creation one last time
by Dan McGee 30 Jun '11

30 Jun '11

We fubar-ed this pretty good. 1. The whole old/new move shuffle was totally busted if you used a relative path to your database, as we would just build the database in place. 2. Our prior temp directory layout had the database files extracted directly into it. When we tried to create a xxx.db.tar.gz file in this same directory, due to the fact that we were no longer using a shell wildcard, we tried to include the db in ourself, which is a big failure. Fix all this by extracting to tree/ so we can have a clean top-level temp directory. 3. Fix the inclusion of the './' directory entry; ensure the regex prunes both leading paths of '.' as well as './'. Where is that test suite again? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 17b32aa..a845049 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -100,7 +100,7 @@ format_entry() { find_pkgentry() { local pkgname=$1 local pkgentry - for pkgentry in $tmpdir/$pkgname*; do + for pkgentry in $tmpdir/tree/$pkgname*; do name=${pkgentry##*/} if [[ ${name%-*-*} = $pkgname ]]; then echo $pkgentry @@ -285,7 +285,7 @@ db_write_entry() { return 1 fi - pushd "$tmpdir" >/dev/null + pushd "$tmpdir/tree" >/dev/null if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" else @@ -350,7 +350,7 @@ db_write_entry() { # create files file if wanted if (( WITHFILES )); then msg2 "$(gettext "Creating '%s' db entry...")" 'files' - local files_path="$tmpdir/$pkgname-$pkgver/files" + local files_path="$tmpdir/tree/$pkgname-$pkgver/files" echo "%FILES%" >$files_path bsdtar --exclude='^.*' -tf "$pkgfile" >>$files_path fi @@ -381,7 +381,7 @@ db_remove_entry() { while [[ -n $pkgentry ]]; do notfound=0 if [[ -f $pkgentry/deltas ]]; then - mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas" + mv "$pkgentry/deltas" "$tmpdir/tree/$pkgname.deltas" fi msg2 "$(gettext "Removing existing entry '%s'...")" \ "${pkgentry##*/}" @@ -443,7 +443,7 @@ check_repo_db() { fi verify_signature "$REPO_DB_FILE" msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir" + bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir/tree" else case "$cmd" in repo-remove) @@ -509,7 +509,7 @@ remove() { msg "$(gettext "Searching for package '%s'...")" "$pkgname" if db_remove_entry "$pkgname"; then - rm -f "$tmpdir/$pkgname.deltas" + rm -f "$tmpdir/tree/$pkgname.deltas" return 0 else error "$(gettext "Package matching '%s' not found.")" "$pkgname" @@ -561,6 +561,7 @@ fi tmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) +mkdir $tmpdir/tree trap 'clean_up' EXIT trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT @@ -628,12 +629,13 @@ if (( success )); then TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE") filename=${REPO_DB_FILE##*/} - pushd "$tmpdir" >/dev/null + pushd "$tmpdir/tree" >/dev/null # strip the './' off filenames; this also allows us to tar an empty dir - bsdtar -s %^./%% -c${TAR_OPT}f "$REPO_DB_FILE" ./ - create_signature "$filename" + bsdtar -s '%^./\?%%' -c${TAR_OPT}f "$tmpdir/$filename" ./ popd >/dev/null + create_signature "$tmpdir/$filename" + [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $REPO_DB_FILE.sig ]] && rm -f "$REPO_DB_FILE.sig" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" -- 1.7.6

4 6

[pacman-dev] [PATCH] makepkg: fix removing symbolic link
by Allan McRae 29 Jun '11

29 Jun '11

The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef..edfa9e3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -518,7 +518,7 @@ download_sources() { local file=$(get_filepath "$netfile" || true) if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" - rm -f "$srcdir/$file" + rm -f "$srcdir/${file##*/}" ln -s "$file" "$srcdir/" continue fi -- 1.7.6

2 4

[pacman-dev] [PATCH] lib/util: modify entry_prefix, not prefix
by Dave Reisner 29 Jun '11

29 Jun '11

Modifying prefix caused tmp directories to be left behind after running scriptlets, and the path '/' to be passed to _alpm_rmrf. Broken in f01c6f. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 6fbe08a..028ed8a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -300,7 +300,7 @@ int _alpm_unpack(pmhandle_t *handle, const char *archive, const char *prefix, /* If specific files were requested, skip entries that don't match. */ if(list) { char *entry_prefix = strdup(entryname); - char *p = strstr(prefix,"/"); + char *p = strstr(entry_prefix,"/"); if(p) { *(p+1) = '\0'; } -- 1.7.6

2 1

[pacman-dev] [PATCH] Make local_db_read() private to the local backend
by Dan McGee 29 Jun '11

29 Jun '11

There is little need to expose the guts of this function even within the library. Make it static in be_local.c, and clean up a few other things since we know exactly where it is being called from: * Remove unnecessary origin checks in _cache_get_*() methods- if you are calling a cache method your package type will be correct. * Remove sanity checks within local_db_read() itself- packages will always have a name and version if they get this far, and the package object will never be NULL either. The one case calling this from outside the backend was in add.c, where we forced a full load of a package before we duplicated it. Move this concern elsewhere and have pkg_dup() always force a full package load via a new force_load() function on the operations callback struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 3 --- lib/libalpm/be_local.c | 45 +++++++++++++++++---------------------------- lib/libalpm/db.h | 1 - lib/libalpm/package.c | 8 ++++++++ lib/libalpm/package.h | 2 ++ 5 files changed, 27 insertions(+), 32 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 4f6c9d4..3df69f8 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -470,9 +470,6 @@ static int commit_single_pkg(pmhandle_t *handle, pmpkg_t *newpkg, /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_dup(local); - /* make sure all infos are loaded because the database entry - * will be removed soon */ - _alpm_local_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL); EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg); _alpm_log(handle, PM_LOG_DEBUG, "upgrading package %s-%s\n", diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5006688..108980f 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -41,10 +41,12 @@ #include "package.h" #include "deps.h" +static int local_db_read(pmpkg_t *info, pmdbinfrq_t inforeq); + #define LAZY_LOAD(info, errret) \ do { \ - if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \ - _alpm_local_db_read(pkg->origin_data.db, pkg, info); \ + if(!(pkg->infolevel & info)) { \ + local_db_read(pkg, info); \ } \ } while(0) @@ -135,9 +137,7 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg) static int _cache_has_scriptlet(pmpkg_t *pkg) { - if(!(pkg->infolevel & INFRQ_SCRIPTLET)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_SCRIPTLET); - } + LAZY_LOAD(INFRQ_SCRIPTLET, NULL); return pkg->scriptlet; } @@ -179,19 +179,13 @@ static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg) static alpm_list_t *_cache_get_files(pmpkg_t *pkg) { - if(pkg->origin == PKG_FROM_LOCALDB - && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES); - } + LAZY_LOAD(INFRQ_FILES, NULL); return pkg->files; } static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) { - if(pkg->origin == PKG_FROM_LOCALDB - && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES); - } + LAZY_LOAD(INFRQ_FILES, NULL); return pkg->backup; } @@ -239,6 +233,11 @@ static int _cache_changelog_close(const pmpkg_t UNUSED *pkg, void *fp) return fclose((FILE *)fp); } +static int _cache_force_load(pmpkg_t *pkg) +{ + return local_db_read(pkg, INFRQ_ALL); +} + /** The local database operations struct. Get package fields through * lazy accessor methods that handle any backend loading and caching @@ -271,6 +270,8 @@ static struct pkg_operations local_pkg_ops = { .changelog_open = _cache_changelog_open, .changelog_read = _cache_changelog_read, .changelog_close = _cache_changelog_close, + + .force_load = _cache_force_load, }; static int checkdbdir(pmdb_t *db) @@ -460,7 +461,7 @@ static int local_db_populate(pmdb_t *db) pkg->handle = db->handle; /* explicitly read with only 'BASE' data, accessors will handle the rest */ - if(_alpm_local_db_read(db, pkg, INFRQ_BASE) == -1) { + if(local_db_read(pkg, INFRQ_BASE) == -1) { _alpm_log(db->handle, PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name); _alpm_pkg_free(pkg); continue; @@ -498,25 +499,13 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) } -int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) +static int local_db_read(pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; char line[1024]; char *pkgpath = NULL; - - if(info == NULL || info->name == NULL || info->version == NULL) { - _alpm_log(db->handle, PM_LOG_DEBUG, - "invalid package entry provided to _alpm_local_db_read, skipping\n"); - return -1; - } - - if(info->origin != PKG_FROM_LOCALDB) { - _alpm_log(db->handle, PM_LOG_DEBUG, - "request to read info for a non-local package '%s', skipping...\n", - info->name); - return -1; - } + pmdb_t *db = info->origin_data.db; /* bitmask logic here: * infolevel: 00001111 diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 0318734..b51412a 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -87,7 +87,6 @@ pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename, void _alpm_db_unregister(pmdb_t *db); /* be_*.c, backend specific calls */ -int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info); int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 75ac94c..f44cd41 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -126,6 +126,8 @@ static int _pkg_changelog_close(const pmpkg_t UNUSED *pkg, return EOF; } +static int _pkg_force_load(pmpkg_t UNUSED *pkg) { return 0; } + /** The standard package operations struct. Get fields directly from the * struct itself with no abstraction layer or any type of lazy loading. */ @@ -157,6 +159,8 @@ struct pkg_operations default_pkg_ops = { .changelog_open = _pkg_changelog_open, .changelog_read = _pkg_changelog_read, .changelog_close = _pkg_changelog_close, + + .force_load = _pkg_force_load, }; /* Public functions for getting package information. These functions @@ -437,6 +441,10 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) pmpkg_t *newpkg; alpm_list_t *i; + if(pkg->ops->force_load(pkg)) { + return NULL; + } + CALLOC(newpkg, 1, sizeof(pmpkg_t), goto cleanup); newpkg->name_hash = pkg->name_hash; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index d18020d..bbb4999 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -76,6 +76,8 @@ struct pkg_operations { size_t (*changelog_read) (void *, size_t, const pmpkg_t *, const void *); int (*changelog_close) (const pmpkg_t *, void *); + int (*force_load) (pmpkg_t *); + /* still to add: * checkmd5sum() ? * compute_requiredby() -- 1.7.6

2 1

[pacman-dev] Patch: Add install like support to makepkg for repo-add
by Simon Gomizelj 29 Jun '11

29 Jun '11

Hi, First of all, I'd like to say that this is both my first patch ever to an upstream project and my first time posting on a development mailing list. I apologize in advance if I have befouled the rules of this list. I recently started playing with repo-add to build a custom repo. I have a netbook and would like to avoid building packages directly on the machine. However I missed the niceness of automatic install with makepkg's -i flag. I have attempted to recreate this support for repo management by adding an -a/--repoadd flag which, instead of using pacman to install the package, adds it to a repo. In order for this to work REPO_PATH and REPO_DB need to be set in makepkg.conf, REPO_PATH being the path of the repository and REPO_DB being the location of the database inside REPO_PATH. I have only recently started playing with repo-add and I admit I'm not very confident with my code. If there is any interest upstream for this functionality, I'm willing to put in the time to perfect this patch if someone can point me in the right direction. >From 56ef40a2dbe42fafd32a152d102962d52e33e6f4 Mon Sep 17 00:00:00 2001 From: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Sat, 11 Jun 2011 21:16:11 -0400 Subject: [PATCH] Added repo-add support. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- scripts/makepkg.sh.in | 84 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 81 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b3081fc..348cb78 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -61,6 +61,7 @@ INFAKEROOT=0 GENINTEG=0 SKIPINTEG=0 INSTALL=0 +REPOADD=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 @@ -401,6 +402,33 @@ run_pacman() { eval "$cmd" } +run_repocp() { + local cmd + printf -v cmd "%q " "cp" -t $REPO_PATH "$@" + warning "$cmd" + if (( ! ASROOT )); then + if type -p sudo >/dev/null; then + cmd="sudo $cmd" + else + cmd="su root -c '$cmd'" + fi + fi + eval "$cmd" +} + +run_repoadd() { + local cmd + printf -v cmd "%q " "$REPO_ADD" $REPO_ADD_OPTS "$@" + if (( ! ASROOT )); then + if type -p sudo >/dev/null; then + cmd="sudo $cmd" + else + cmd="su root -c '$cmd'" + fi + fi + eval "$cmd" +} + check_deps() { (( $# > 0 )) || return 0 @@ -1241,6 +1269,39 @@ install_package() { fi } +repoadd_package() { + (( ! REPOADD )) && return + + if (( ! SPLITPKG )); then + msg "$(gettext "Adding package %s to repo %s with %s...")" "$pkgname" "$REPO_DB" "$REPO_ADD" + else + msg "$(gettext "Adding %s package group to repo with %s...")" "$pkgbase" "$REPO_DB" "$REPO_ADD" + fi + + local fullver pkg pkglist repolist + for pkg in ${pkgname[@]}; do + # TODO: this wasn't properly fixed in commit 2020e629 + fullver=$(get_full_version $epoch $pkgver $pkgrel) + if [[ -f $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT} ]]; then + pkglist+=" $PKGDEST/${pkg}-${fullver}-${CARCH}${PKGEXT}" + repolist+=" $REPO_PATH/${pkg}-${fullver}-${CARCH}${PKGEXT}" + else + pkglist+=" $REPO_PATH/${pkg}-${fullver}-any${PKGEXT}" + repolist+=" $REPO_PATH/${pkg}-${fullver}-any${PKGEXT}" + fi + done + + if ! run_repocp $pkglist; then + warning "$(gettext "Failed to copy package(s) to %s." "$REPO_PATH")" + return 0 + fi + + if ! run_repoadd $REPO_PATH/$REPO_DB $repolist; then + warning "$(gettext "Failed to add package(s) to repo %s." "$REPO_DB")" + return 0 + fi +} + check_sanity() { # check for no-no's in the build script local i @@ -1609,6 +1670,7 @@ usage() { echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -i, --install Install package after successful build")" + echo "$(gettext " -a, --repoadd Add the package to a repo after successful build")" echo "$(gettext " -L, --log Log package build process")" echo "$(gettext " -m, --nocolor Disable colorized output messages")" echo "$(gettext " -o, --nobuild Download and extract files only")" @@ -1659,10 +1721,10 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcCdefFghiaLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" +OPT_LONG+=",install,repoadd,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" @@ -1697,6 +1759,7 @@ while true; do -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; + -a|--repoadd) REPOADD=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; @@ -1749,6 +1812,9 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} +# set repoadd command if not already defined +REPO_ADD=${REPO_ADD:-repo-add} + # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then @@ -1970,6 +2036,10 @@ if (( ! SPLITPKG )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? + elif (( REPOADD )); then + warning "$(gettext "A package has already been built, adding existing package...")" + repoadd_package + exit $? else error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 @@ -1994,6 +2064,10 @@ else warning "$(gettext "The package group has already been built, installing existing packages...")" install_package exit $? + elif (( REPOADD )); then + warning "$(gettext "The package group has already been built, adding existing packages...")" + repoadd_package + exit $? else error "$(gettext "The package group has already been built. (use -f to overwrite)")" exit 1 @@ -2174,7 +2248,11 @@ fi fullver=$(get_full_version $epoch $pkgver $pkgrel) msg "$(gettext "Finished making: %s")" "$pkgbase $fullver ($(date))" -install_package +if (( INSTALL )); then + install_package +elif (( REPOADD )); then + repoadd_package +fi exit 0 #E_OK -- 1.7.5.2

3 2