From 9b235734a1810e415acfea2eefaeff008a8073a6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 21:14:32 -0500 Subject: librerelease: list staged source files in a sane way --- src/abslibre-tools/librerelease | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index b77b6ec..1e07638 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -181,10 +181,11 @@ main() { # The different modes (sans 'usage') ########################################### pretty_print_packages() { - find "$WORKDIR/staging/" -mindepth 1 -type d -not -empty -printf '%f\n' | sort | - while read -r repo; do - msg2 "$repo" - find -L "${WORKDIR}/staging/${repo}" -type f -printf "%f\n" | sort + find "$WORKDIR/staging/" -mindepth 1 -maxdepth 1 -type d -not -empty | sort | + while read -r path; do + msg2 "${path##*/}" + cd "$path" + find -L . -type f | sed 's|^\./| |' | sort done } -- cgit v1.2.3-2-g168b From a5dadc1f833f06f5cfa655fabfa37b54b6c168db Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 22:13:47 -0500 Subject: librerelease: don't clean non-package files --- src/abslibre-tools/librerelease | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 1e07638..70ed128 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -101,13 +101,6 @@ sign_packages() { done } -# Remove everything that's not a package or a signature -clean_non_packages() { - find $WORKDIR/staging/ -type f \ - \! -iname "*.pkg.tar.?z" -a \! -iname "*.pkg.tar.?z.sig" \ - -delete -} - # Clean everything if not on dry-run mode clean_files() { local file_list=$1 @@ -212,7 +205,6 @@ release_packages() { lock 10 "${WORKDIR}/staging.lock" \ 'Waiting for an exclusive lock on the staging directory' - clean_non_packages sign_packages || return 1 # Make the permissions of the packages 644 otherwise the user will get access -- cgit v1.2.3-2-g168b From 8c52811113e58289daec68289a503aee29ee1380 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 22:17:01 -0500 Subject: librefetch: handle "empty" situations better --- src/abslibre-tools/librerelease | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 70ed128..06a26e8 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -53,9 +53,9 @@ readonly rsync_flags=( # Functions #################################################################### -list0_files() { - find -L "${WORKDIR}/staging" -type f -print0 | xargs -0 realpath -z --relative-to="${WORKDIR}/staging" -} +list0_files() ( + cd "$WORKDIR" && find -L 'staging' -type f -print0 +) # This function is taken almost verbatim from makepkg create_signature() { @@ -111,7 +111,9 @@ clean_files() { fi msg "Removing files from local staging directory" - cd "${WORKDIR}/staging" && xargs -0 -a "$file_list" "${rmcmd[@]}" + cd "${WORKDIR}/staging" && xargs -0r -a "$file_list" "${rmcmd[@]}" + cd "${WORKDIR}/staging" && find . -mindepth 1 -type d -empty \ + -exec rmdir -p {} + 2>/dev/null } ################################################################################ @@ -221,7 +223,7 @@ release_packages() { msg "%s to upload" "$(cd "${WORKDIR}/staging" && du -hc --files0-from="$file_list" | sed -n '$s/\t.*//p')" msg "Uploading packages..." - xargs -0 -a "$file_list" dirname -z | ssh ${REPODEST%%:*} "$(printf 'mkdir -p -- %q && cd %q && xargs -0 mkdir -pv --' "${REPODEST#*:}" "${REPODEST#*:}")" + xargs -0r -a "$file_list" dirname -z | ssh ${REPODEST%%:*} "$(printf 'mkdir -p -- %q && cd %q && xargs -0r mkdir -pv --' "${REPODEST#*:}" "${REPODEST#*:}")" if ! rsync ${dryrun} "${rsync_flags[@]}" \ -0 --files-from="$file_list" \ ${WORKDIR}/staging \ -- cgit v1.2.3-2-g168b From 39b13f63d0fd89bfa3cae1feb8744fb100eb5651 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 23:21:44 -0500 Subject: librerelease: fix --- src/abslibre-tools/librerelease | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 06a26e8..aca8fef 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -53,9 +53,10 @@ readonly rsync_flags=( # Functions #################################################################### -list0_files() ( - cd "$WORKDIR" && find -L 'staging' -type f -print0 -) +list0_files() { + find -L "${WORKDIR}/staging" -type f \ + -exec realpath -z --relative-to="${WORKDIR}/staging" {} + +} # This function is taken almost verbatim from makepkg create_signature() { @@ -84,19 +85,19 @@ sign_packages() { warning "It's better to have \`%s\` running to sign packages in batches" 'gpg-agent --daemon' fi - for package in $(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'); do - if [[ -f "${package}.sig" ]]; then - msg2 "Package signature found, verifying..." + for file in $(find "${WORKDIR}/staging/" -type f -not -iname '*.sig'); do + if [[ -f "${file}.sig" ]]; then + msg2 "File signature found, verifying..." # Verify that the signature is correct, else remove for re-signing - if ! gpg --quiet --verify "${package}.sig" >/dev/null 2>&1; then + if ! gpg --quiet --verify "${file}.sig" >/dev/null 2>&1; then error "Failed! Re-signing..." - rm -f "${package}.sig" + rm -f "${file}.sig" fi fi - if ! [[ -f "${package}.sig" ]]; then - create_signature "$package" || return 2 + if ! [[ -f "${file}.sig" ]]; then + create_signature "$file" || return 2 fi done } -- cgit v1.2.3-2-g168b From b129824bfc9c5c85cadf98dfb724405d63dfc6c3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Jan 2014 00:59:48 -0500 Subject: normalize to use >&2 instead of /dev/stderr --- src/abslibre-tools/librerelease | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index aca8fef..23a1c2d 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -149,12 +149,12 @@ main() { u) upload_only=true ;; n) dryrun="--dry-run" ;; h) mode=usage ;; - *) usage >/dev/stderr; return 1 ;; + *) usage >&2; return 1 ;; esac done shift $(($OPTIND - 1)) if [[ $# != 0 ]]; then - usage >/dev/stderr + usage >&2 return 1 fi -- cgit v1.2.3-2-g168b From ea11eca851e1b54e36d310f4d69e099f169191e8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Feb 2014 00:05:22 -0500 Subject: I forgot to bump the copyright year on all the files I've touched this year --- src/abslibre-tools/librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 23a1c2d..558ec37 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -3,7 +3,7 @@ # Uploads packages into [staging] # Copyright 2010 Nicolás Reynolds -# Copyright 2013 Luke Shumaker +# Copyright 2013-2014 Luke Shumaker # For just the create_signature() function: # Copyright (c) 2006-2013 Pacman Development Team # Copyright (c) 2002-2006 by Judd Vinet -- cgit v1.2.3-2-g168b From c43f0808583070a22e904cd650e8ed17fe781806 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Feb 2014 00:20:19 -0500 Subject: Normalize to use the string "Copyright (C)" --- src/abslibre-tools/librerelease | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 558ec37..8b1e05f 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -2,23 +2,23 @@ # Librerelease # Uploads packages into [staging] -# Copyright 2010 Nicolás Reynolds -# Copyright 2013-2014 Luke Shumaker +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker # For just the create_signature() function: -# Copyright (c) 2006-2013 Pacman Development Team -# Copyright (c) 2002-2006 by Judd Vinet -# Copyright (c) 2005 by Aurelien Foret -# Copyright (c) 2006 by Miklos Vajna -# Copyright (c) 2005 by Christian Hamar -# Copyright (c) 2006 by Alex Smith -# Copyright (c) 2006 by Andras Voroskoi -# Copyright (c) 2006-2013 Pacman Development Team -# Copyright (c) 2002-2006 by Judd Vinet -# Copyright (c) 2005 by Aurelien Foret -# Copyright (c) 2006 by Miklos Vajna -# Copyright (c) 2005 by Christian Hamar -# Copyright (c) 2006 by Alex Smith -# Copyright (c) 2006 by Andras Voroskoi +# Copyright (C) 2006-2013 Pacman Development Team +# Copyright (C) 2002-2006 by Judd Vinet +# Copyright (C) 2005 by Aurelien Foret +# Copyright (C) 2006 by Miklos Vajna +# Copyright (C) 2005 by Christian Hamar +# Copyright (C) 2006 by Alex Smith +# Copyright (C) 2006 by Andras Voroskoi +# Copyright (C) 2006-2013 Pacman Development Team +# Copyright (C) 2002-2006 by Judd Vinet +# Copyright (C) 2005 by Aurelien Foret +# Copyright (C) 2006 by Miklos Vajna +# Copyright (C) 2005 by Christian Hamar +# Copyright (C) 2006 by Alex Smith +# Copyright (C) 2006 by Andras Voroskoi # # This file is part of Parabola. # -- cgit v1.2.3-2-g168b From d25f30f25ce61367c81133c9cd01fe3169d8f6c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Mar 2014 14:39:06 -0400 Subject: Do an audit of copyright and license claims --- src/abslibre-tools/librerelease | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 8b1e05f..eec62d7 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -2,23 +2,19 @@ # Librerelease # Uploads packages into [staging] -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker +# # For just the create_signature() function: # Copyright (C) 2006-2013 Pacman Development Team -# Copyright (C) 2002-2006 by Judd Vinet -# Copyright (C) 2005 by Aurelien Foret -# Copyright (C) 2006 by Miklos Vajna -# Copyright (C) 2005 by Christian Hamar -# Copyright (C) 2006 by Alex Smith -# Copyright (C) 2006 by Andras Voroskoi -# Copyright (C) 2006-2013 Pacman Development Team -# Copyright (C) 2002-2006 by Judd Vinet -# Copyright (C) 2005 by Aurelien Foret -# Copyright (C) 2006 by Miklos Vajna -# Copyright (C) 2005 by Christian Hamar -# Copyright (C) 2006 by Alex Smith -# Copyright (C) 2006 by Andras Voroskoi +# Copyright (C) 2002-2006 Judd Vinet +# Copyright (C) 2005 Aurelien Foret +# Copyright (C) 2006 Miklos Vajna +# Copyright (C) 2005 Christian Hamar +# Copyright (C) 2006 Alex Smith +# Copyright (C) 2006 Andras Voroskoi +# +# License: GNU GPLv3+ # # This file is part of Parabola. # @@ -35,6 +31,9 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . +# create_signature() is taken from pacman:makepkg, which is GPLv2+, +# so we take the '+' to combine it with our GPLv3+. + . libremessages . $(librelib conf.sh) -- cgit v1.2.3-2-g168b From c48ac8c89e596e160505bd5678db2b193607493f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Mar 2014 22:00:44 -0400 Subject: Audit the authors and copyright years of files against git logs --- src/abslibre-tools/librerelease | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/abslibre-tools/librerelease') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index eec62d7..03a57e0 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -2,7 +2,9 @@ # Librerelease # Uploads packages into [staging] -# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2010-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010-2013 Nicolás Reynolds +# Copyright (C) 2013 Michał Masłowski # Copyright (C) 2013-2014 Luke Shumaker # # For just the create_signature() function: -- cgit v1.2.3-2-g168b