- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] repo-add: merge desc and depends files
by Allan McRae 19 Mar '15

19 Mar '15

There is little point in these two files being separated as the whole sync db is parsed at once. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Reading sync dbs from the tarball was introduced in pacman-3.5 (2011-03-16). That also introduced the combined handling of depends and desc files (commit a44c7b8956). So this change (and indeed the preceeding patch moving REPLACES and CONFLICTS into desc) will result in pacman-3.4 being unable to read databases created by repo-add-5.0. Is this acceptable? scripts/repo-add.sh.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fb04b3f..3ece8d5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -420,16 +420,12 @@ db_write_entry() { format_entry "REPLACES" "${_replaces[@]}" format_entry "CONFLICTS" "${_conflicts[@]}" format_entry "PROVIDES" "${_provides[@]}" - } >'desc' - # create depends entry - msg2 "$(gettext "Creating '%s' db entry...")" 'depends' - { format_entry "DEPENDS" "${_depends[@]}" format_entry "OPTDEPENDS" "${_optdepends[@]}" format_entry "MAKEDEPENDS" "${_makedepends[@]}" format_entry "CHECKDEPENDS" "${_checkdepends[@]}" - } >'depends' + } >'desc' popd >/dev/null popd >/dev/null -- 2.3.3

1 0

[pacman-dev] [PATCH] repo-add: put conflicts/provides in desc file
by Allan McRae 19 Mar '15

19 Mar '15

It does not make sense for these fields to be in the "depends" file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c7923ec..fb04b3f 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -418,14 +418,14 @@ db_write_entry() { format_entry "BUILDDATE" "$builddate" format_entry "PACKAGER" "$packager" format_entry "REPLACES" "${_replaces[@]}" + format_entry "CONFLICTS" "${_conflicts[@]}" + format_entry "PROVIDES" "${_provides[@]}" } >'desc' # create depends entry msg2 "$(gettext "Creating '%s' db entry...")" 'depends' { format_entry "DEPENDS" "${_depends[@]}" - format_entry "CONFLICTS" "${_conflicts[@]}" - format_entry "PROVIDES" "${_provides[@]}" format_entry "OPTDEPENDS" "${_optdepends[@]}" format_entry "MAKEDEPENDS" "${_makedepends[@]}" format_entry "CHECKDEPENDS" "${_checkdepends[@]}" -- 2.3.3

1 0

[pacman-dev] [PATCH] makepkg: write validpgpkeys to .SRCINFO
by Allan McRae 19 Mar '15

19 Mar '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 168f334..4ff45e8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1794,7 +1794,7 @@ srcinfo_write_global() { local multivalued=(arch groups license checkdepends makedepends depends optdepends provides conflicts replaces noextract options backup - source {md5,sha{1,224,256,384,512}}sums) + source validpgpkeys {md5,sha{1,224,256,384,512}}sums) srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" srcinfo_write_section_details '' -- 2.3.3

1 0

[pacman-dev] [PATCH v2] PKGBUILD.5: have epoch directly following pkgver/pkgrel
by Allan McRae 19 Mar '15

19 Mar '15

These three fields should be grouped together. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This time with only the changes I wanted to commit! doc/PKGBUILD.5.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index a1d42fd..bc278f2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -64,11 +64,6 @@ below). software release and incremented for intermediate PKGBUILD updates. The variable is not allowed to contain hyphens. -*pkgdesc*:: - This should be a brief description of the package and its functionality. - Try to keep the description to one line of text and to not use the package's - name. - *epoch*:: Used to force the package to be seen as newer than any previous versions with a lower epoch, even if the version number would normally not trigger @@ -78,6 +73,11 @@ below). version comparison logic. See linkman:pacman[8] for more information on version comparisons. +*pkgdesc*:: + This should be a brief description of the package and its functionality. + Try to keep the description to one line of text and to not use the package's + name. + *url*:: This field contains a URL that is associated with the software being packaged. This is typically the project's web site. -- 2.3.3

1 0

[pacman-dev] [PATCH] PKGBUILD.5: have epoch directly following pkgver/pkgrel
by Allan McRae 19 Mar '15

19 Mar '15

These three fields should be grouped together. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 10 +++++----- scripts/repo-add.sh.in | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index a1d42fd..bc278f2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -64,11 +64,6 @@ below). software release and incremented for intermediate PKGBUILD updates. The variable is not allowed to contain hyphens. -*pkgdesc*:: - This should be a brief description of the package and its functionality. - Try to keep the description to one line of text and to not use the package's - name. - *epoch*:: Used to force the package to be seen as newer than any previous versions with a lower epoch, even if the version number would normally not trigger @@ -78,6 +73,11 @@ below). version comparison logic. See linkman:pacman[8] for more information on version comparisons. +*pkgdesc*:: + This should be a brief description of the package and its functionality. + Try to keep the description to one line of text and to not use the package's + name. + *url*:: This field contains a URL that is associated with the software being packaged. This is typically the project's web site. diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c7923ec..013fce5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -465,6 +465,27 @@ db_write_entry() { return 0 } # end db_write_entry +db_write_source() { + # blank out all variables + local sourcefile=$1 + local -a _licenses _source _noextract _md5sums _sha1sums _sha256sums \ + _sha384sums, _sha512sums, _groups _arch _backup _depends _makedepends \ + _checkdepends _optdepends _conflicts _provides _replaces _options + local pkgbase pkgver pkgrel pkgdesc epoch url install changelog \ + md5sum sha256sum pgpsig pgpsigsize + + # read info from the zipped package + local line var val + while read -r line; do + [[ ${line:0:1} = '#' ]] && continue + IFS=' =' read -r var val < <(printf '%s\n' "$line") + + + done< <(bsdtar -xOqf "$pkgfile" .PKGINFO) + + return 0 +} + # remove existing entries from the DB # arg1 - package name db_remove_entry() { @@ -484,6 +505,10 @@ db_remove_entry() { local filesentry=$(echo "$pkgentry" | sed 's/$.*$\/db\//\1\/files\//') rm -rf "$filesentry" + # remove entries in "files" database + local sourceentry=$(echo "$pkgentry" | sed 's/$.*$\/db\//\1\/sourceq\//') + rm -rf "$sourceentry" + pkgentry=$(find_pkgentry "$pkgname") done return $notfound @@ -524,7 +549,7 @@ prepare_repo_db() { exit 1 fi - for repo in "db" "files"; do + for repo in "db" "files" "source"; do dbfile=${repodir}/$REPO_DB_PREFIX.$repo.$REPO_DB_SUFFIX if [[ -f $dbfile ]]; then @@ -579,6 +604,14 @@ add() { fi fi + if [[ $1 == *.db.tar* ]]; then + srcfile=$1 + msg "$(gettext "Adding source package '%s'")" "$srcfile" + if db_write_source "$srcfile"; then + return 0 + else + return 1 + pkgfile=$1 if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" @@ -619,7 +652,7 @@ rotate_db() { pushd $dirname >/dev/null - for repo in "db" "files"; do + for repo in "db" "files" "source"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} tempname=$dirname/.tmp.$filename @@ -663,7 +696,7 @@ create_db() { # $LOCKFILE is already guaranteed to be absolute so this is safe dirname=${LOCKFILE%/*} - for repo in "db" "files"; do + for repo in "db" "files" "source"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} # this ensures we create it on the same filesystem, making moves atomic tempname=$dirname/.tmp.$filename @@ -734,7 +767,7 @@ tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) -for repo in "db" "files"; do +for repo in "db" "files" "source"; do mkdir "$tmpdir/$repo" done -- 2.3.3

1 0

[pacman-dev] Db pkgcache invalidation
by Fabien Bourigault 19 Mar '15

19 Mar '15

I'm the current maintainer of PackageKit alpm backend and I need to invalidate localdb pkgcache when user run pacman by hand and packagekitd is running. I already added an inotify watch on the localdb directory but now I need to refresh the backend libalpm state. Is there any existing way to achieve this ? If not, is the behavior I need could be achieved by unsetting the DB_STATUS_PKGCACHE ?

2 1

[pacman-dev] [PATCH 1/3] makepkg: Do not provide $pkgdir to build()
by David Macek 19 Mar '15

19 Mar '15

--- scripts/makepkg.sh.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 168f334..9843efe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3198,9 +3198,6 @@ else fi -# set pkgdir to something "sensible" for (not recommended) use during build() -pkgdir="$pkgdirbase/$pkgbase" - if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" -- 1.9.4.msysgit.2 -- David Macek

2 3

[pacman-dev] [PATCH 2/3] makepkg: Create $pkgdirbase after build(), before package()
by David Macek 17 Mar '15

17 Mar '15

--- scripts/makepkg.sh.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9843efe..6ca678e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3388,13 +3388,6 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # clean existing pkg directory - if [[ -d $pkgdirbase ]]; then - msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" - rm -rf "$pkgdirbase" - fi - mkdir -p "$pkgdirbase" - chmod a-srwx "$pkgdirbase" cd_safe "$startdir" if (( ! REPKG )); then @@ -3403,6 +3396,14 @@ else cd_safe "$startdir" fi + # clean existing pkg directory + if [[ -d $pkgdirbase ]]; then + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" + rm -rf "$pkgdirbase" + fi + mkdir -p "$pkgdirbase" + chmod a-srwx "$pkgdirbase" + enter_fakeroot fi -- 1.9.4.msysgit.2 -- David Macek

1 0

[pacman-dev] [PATCH 4/7] repo-add: check early for xdelta if it is needed
by Allan McRae 15 Mar '15

15 Mar '15

The check for xdelta3 was done as needed (and not in all cases). Do this check early so that repo-add does not abort part way through. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d496354..c16295b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -212,6 +212,28 @@ check_gpg() { fi } +check_xdelta() { + local need_xdelta=0 + + if (( DELTA )); then + need_xdelta=1 + else + if [[ $cmd == "repo-add" ]]; + for f in ${args[@]:1}; do + case $f in + *.delta) need_xdelta=1 ;; + *) ;; + done + fi + + if (( need_xdelta )); then + if ! type xdelta3 &>/dev/null; then + error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" + exit 1 + fi + fi +} + # sign the package database once repackaged create_signature() { (( ! SIGN )) && return @@ -525,10 +547,6 @@ add() { if [[ ${1##*.} == "delta" ]]; then deltafile=$1 msg "$(gettext "Adding delta '%s'")" "$deltafile" - if ! type xdelta3 &>/dev/null; then - error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" - exit 1 - fi if db_write_delta "$deltafile"; then return 0 else @@ -736,6 +754,8 @@ if (( SIGN || KEY || VERIFY )); then check_gpg fi +check_xdelta + fail=0 for arg in "${args[@]:1}"; do case $cmd in -- 2.3.3

1 3

[pacman-dev] [PATCH 3/7] repo-add: only update database if entire command succeeded
by Allan McRae 15 Mar '15

15 Mar '15

It is not hard to think of situations where the repo database should not be updated unless the whole operation succeeds. Error out before a partial database update occurs. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2d9b262..d496354 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -688,7 +688,6 @@ trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR declare -a args -success=0 # parse arguments while (( $# )); do case $1 in @@ -737,15 +736,16 @@ if (( SIGN || KEY || VERIFY )); then check_gpg fi +fail=0 for arg in "${args[@]:1}"; do case $cmd in repo-add) add "$arg" ;; repo-remove) remove "$arg" ;; - esac && success=1 + esac || fail=1 done -# if at least one operation was a success, re-zip database -if (( success )); then +# if the whole operation was a success, re-zip and rotate database +if (( !fail )); then msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" create_db rotate_db -- 2.3.3

1 0