From f5663f08d44091ca16c7f53c492c2594202ba7e5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 16:52:57 -0500 Subject: update to the new devtools --- src/lib/common.sh.top | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/lib') diff --git a/src/lib/common.sh.top b/src/lib/common.sh.top index 054301b..625ea05 100644 --- a/src/lib/common.sh.top +++ b/src/lib/common.sh.top @@ -13,6 +13,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +shopt -s extglob + if [[ -z ${_INCLUDE_COMMON_SH:-} ]]; then _INCLUDE_COMMON_SH=true -- cgit v1.2.3-54-g00ecf From 56384e572d419a48439a90b9481a715a13a109c8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 17:09:11 -0500 Subject: src/lib/: set TEXTDOMAIN differently for internal messages This allows us to fix the long-standing bug that libremessages forces TEXTDOMAIN=libretools --- src/lib/Makefile | 8 +++++++- src/lib/common.sh.top | 8 ++++++-- src/lib/conf.sh | 4 ++-- src/lib/libreblacklist | 8 +++++--- src/lib/librelib | 29 +++++++++++++++++++++-------- src/lib/libremessages | 2 +- src/lib/libremessages.1.ronn | 6 ------ 7 files changed, 42 insertions(+), 23 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Makefile b/src/lib/Makefile index 4f24ad3..4ed5e4f 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -14,7 +14,13 @@ common.sh: %: %.in %.top Makefile @{ \ cat '$*.top' && \ echo && \ - sed -r -e '/encoding problem/d;/LANG=/d' -e 's/mesg=\$$(.)/mesg="$$(_ "$$\1")"/' '$*.in' && \ + sed -r \ + -e '/encoding problem/d;/LANG=/d' \ + -e 's/mesg=\$$(.)/mesg="$$(_ "$$\1")"/' \ + -e 's/gettext /_l _ /g' \ + -e "s/^(\s+)(msg|error) '/\1_l \2 '/" \ + -e 's|lock\(\)\s*\{|lock()\n{|' \ + '$*.in' && \ echo && \ cat '$*.bottom' && \ :; } > '$@' diff --git a/src/lib/common.sh.top b/src/lib/common.sh.top index 625ea05..9c4ba2e 100644 --- a/src/lib/common.sh.top +++ b/src/lib/common.sh.top @@ -18,11 +18,15 @@ shopt -s extglob if [[ -z ${_INCLUDE_COMMON_SH:-} ]]; then _INCLUDE_COMMON_SH=true -export TEXTDOMAIN='libretools' -export TEXTDOMAINDIR='/usr/share/locale' +[[ -n ${TEXTDOMAIN:-} ]] || export TEXTDOMAIN='libretools' +[[ -n ${TEXTDOMAINDIR:-} ]] || export TEXTDOMAINDIR='/usr/share/locale' if type gettext &>/dev/null; then _() { gettext "$@"; } else _() { echo "$@"; } fi + +_l() { + TEXTDOMAIN='librelib' TEXTDOMAINDIR='/usr/share/locale' "$@" +} diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 0a6fb89..4445bef 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -122,10 +122,10 @@ check_vars() { if [[ -z ${!VAR:-} ]]; then type print &>/dev/null || . libremessages if [[ $(list_files $slug|wc -l) -gt 1 ]]; then - print "Configure '%s' in one of:" "$VAR" + _l print "Configure '%s' in one of:" "$VAR" list_files $slug | sed 's/./ -> &/' else - print "Configure '%s' in '%s'" "$VAR" "$(list_files $slug)" + _l print "Configure '%s' in '%s'" "$VAR" "$(list_files $slug)" fi ret=1 fi diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 5db1a3f..267d32d 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -48,7 +48,7 @@ blacklist-update() ( local remote_blacklist="$BLACKLIST" local local_blacklist="$XDG_CACHE_HOME/libretools/blacklist.txt" - stat_busy "Downloading blacklist of proprietary software packages" + _l stat_busy "Downloading blacklist of proprietary software packages" mkdir -p "${local_blacklist%/*}" if wget -N -q -O "${local_blacklist}.part" "$remote_blacklist" 2>/dev/null; then @@ -58,9 +58,9 @@ blacklist-update() ( stat_done rm "${local_blacklist}.part" if [[ -e "$local_blacklist" ]]; then - warning "Using local copy of blacklist" + _l warning "Using local copy of blacklist" else - error "Download failed, exiting" + _l error "Download failed, exiting" return 1 fi @@ -109,6 +109,8 @@ if [[ "${0##*/}" == libreblacklist ]]; then sed 's/\r/\n/g'<<<"$1"|sed -e '/^$/d' -e 's/^# //' } usage() { + export TEXTDOMAIN='librelib' + export TEXTDOMAINDIR='/usr/share/locale' . $(librelib messages) if [[ $# -eq 0 ]]; then print "Usage: %s [-h] COMMAND [ARGUMENTS]" "${0##*/}" diff --git a/src/lib/librelib b/src/lib/librelib index a58f5d3..3b05e37 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -16,18 +16,31 @@ default_libdir=/usr/lib/libretools -if ! type gettext &>/dev/null; then - gettext() { echo "$@"; } +if type gettext &>/dev/null; then + _() { gettext "$@"; } +else + _() { echo "$@"; } fi +_l() { + TEXTDOMAIN='librelib' TEXTDOMAINDIR='/usr/share/locale' "$@" +} + print() { - mesg=$1 + local mesg="$(_ "$1")" shift - printf -- "$(gettext "$mesg")\n" "$@" + printf -- "$mesg\n" "$@" +} + +_html_whitespace_collapse() { + [[ $# == 0 ]] || panic + tr '\n' ' ' | sed -r -e 's/\t/ /g' -e 's/ +/ /g' } prose() { - print "$@" | fmt -su + [[ $# -ge 1 ]] || panic + local mesg="$(_ "$(_html_whitespace_collapse <<<"$1")")"; shift + printf -- "$mesg" "$@" | fmt -u } cmd=${0##*/} @@ -54,11 +67,11 @@ usage() { main() { if [[ $# != 1 ]]; then - usage >&2 + _l usage >&2 return 2 fi if [[ $1 == '-h' ]]; then - usage + _l usage return 0; fi @@ -76,7 +89,7 @@ main() { return 0; fi done - print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr + _l print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr return 1 } diff --git a/src/lib/libremessages b/src/lib/libremessages index c6d08e2..8766578 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -36,7 +36,7 @@ ################################################################################ panic() { - echo "$(_ 'panic: malformed call to internal function')" >&2 + echo "$(_l _ 'panic: malformed call to internal function')" >&2 exit 1 } diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn index b91a958..30314c8 100644 --- a/src/lib/libremessages.1.ronn +++ b/src/lib/libremessages.1.ronn @@ -188,12 +188,6 @@ These routines relate to `makepkg`(8). ## BUGS -libremessages sets to `libretools` unconditionally, -making it generally unsuitable for use outside of libretools. If you -override after loading the library, that should work, but -you will also have to provide translations for libremessage's internal -messages (such as "ERROR" or "Warning"). - Generating `.pot` files for the prose functions is a pain. The libretools Makefiles have rules to do it, but it might make sense to pull it into a separate program. -- cgit v1.2.3-54-g00ecf From b07f84783a9b3e4e799e93173977882de6c16fa8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 5 Jan 2014 17:09:30 -0500 Subject: src/lib/: misc touch-up --- src/lib/conf.sh | 4 ++-- src/lib/libremessages | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib') diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 4445bef..6b1ab49 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -112,7 +112,7 @@ load_files() { # Check whether the variables listed are properly set. # If not, it prints a message saying to set them in the configuration file(s) # for $slug. -check_vars() { +check_vars() ( local slug=$1; shift local ret=0 @@ -134,7 +134,7 @@ check_vars() { if [[ $ret != 0 ]]; then return 1 fi -} +) # Usage: get_var # Does not work with arrays diff --git a/src/lib/libremessages b/src/lib/libremessages index 8766578..8e48c3b 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -88,8 +88,6 @@ bullet() { # bullet. flag() { [[ $# == 2 ]] || panic - local n=' -' local flag=$1 local desc="$(_ "$(_html_whitespace_collapse <<<"$2")")" @@ -99,7 +97,7 @@ flag() { done local lines - IFS=$n lines=($(fmt -u -w $((73-indent)) <<<"$desc")) + IFS=$'\n' lines=($(fmt -u -w $((73-indent)) <<<"$desc")) local line for line in "${lines[@]}"; do printf " %-${indent}s %s\n" "$flag" "$line" -- cgit v1.2.3-54-g00ecf From ca879723bef3b0f638a2e6262f1fc869cf2b14be Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 18 Jan 2014 12:47:01 -0500 Subject: Update libremessages.1.ronn --- src/lib/libremessages.1.ronn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn index 30314c8..bf052bd 100644 --- a/src/lib/libremessages.1.ronn +++ b/src/lib/libremessages.1.ronn @@ -104,7 +104,7 @@ For each of these, is fed through `gettext` automatically. These routines print to standard error, and all take arguments in the same format as `printf`(1), except for `stat_done`, which doesn't take -any arguments. +any arguments. Each of these print to stderr, not stdout. For each of these, is fed through `gettext` automatically. @@ -178,6 +178,13 @@ these, you could end up deleting a lot of someone's work. These routines relate to `makepkg`(8). + * `find_cached_package` [-: + Searches for a localy built copy of the specified package, in + and the current working directory. If is not + specified, any value will match. If multiple matching files are + found (not counting duplicate links), then an error is printed to + stderr and nothing is prented to stdout. + * `get_full_version` []: Inspects variables that are set, and prints the full version spec, including if necessary, , and . By -- cgit v1.2.3-54-g00ecf From 63362d52d3943f40fb96898a2b4e87e17f0adcf4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Jan 2014 00:43:09 -0500 Subject: libremessages: add a setup_traps routine --- src/lib/libremessages | 19 +++++++++++++++++++ src/lib/libremessages.1.ronn | 4 ++++ 2 files changed, 23 insertions(+) (limited to 'src/lib') diff --git a/src/lib/libremessages b/src/lib/libremessages index 8e48c3b..df0a98a 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -117,6 +117,25 @@ term_title() { printf "$fmt" "$*" } +# Usage: setup_traps +# Sets up traps on TERM, HUP, QUIT and INT signals, as well as the ERR event, +# similar to makepkg +setup_traps() { + _libremessages_trap_exit() { + local signal=$1; shift + echo + error "$@" + trap -- "$signal" + kill "-$signal" "$$" + } + set -E + for signal in TERM HUP QUIT; do + trap "_libremessages_trap_exit $signal '%s signal caught. Exiting...' $signal" $signal + done + trap '_libremessages_trap_exit INT "Aborted by user! Exiting..."' INT + trap '_libremessages_trap_exit USR1 "An unknown error has occurred. Exiting..."' ERR +} + ################################################################################ # Run one of the defined functions if invoked directly # ################################################################################ diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn index bf052bd..d4c35fc 100644 --- a/src/lib/libremessages.1.ronn +++ b/src/lib/libremessages.1.ronn @@ -69,6 +69,10 @@ Unless otherwise noted, these do not implicitly call `gettext`. Joins all arguments with whitespace, and sets the terminal title to that. + * `setup_traps`: + Sets traps on TERM, HUP, QUIT and INT signals, as sell as the ERR + event, similar to makepkg. + ### PROSE ROUTINES These routines print to standard output, ande are useful for printing -- cgit v1.2.3-54-g00ecf 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 ++-- src/abslibre-tools/librestage | 4 ++-- src/chroot-tools/librechroot | 14 +++++++------- src/lib/libreblacklist | 2 +- src/lib/librelib | 2 +- src/librefetch/librefetch | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/lib') 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 diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 96fee8b..4ea6edc 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -42,12 +42,12 @@ main() { while getopts 'h' arg; do case $arg in h) usage; return 0;; - *) usage >/dev/stderr; return 1;; + *) usage >&2; return 1;; esac done repos=("$@") if [[ ${#repos[@]} -eq 0 ]]; then - usage >>/dev/stderr + usage >&2 return 1; fi diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 64c3a46..0f0ed10 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -223,19 +223,19 @@ main() { C|M) arch_nspawn_flags+=(-$opt "$OPTARG");; w) sysd_nspawn_flags+=("--bind=$OPTARG");; r) sysd_nspawn_flags+=("--bind-ro=$OPTARG");; - *) usage >/dev/stderr; return 1;; + *) usage >&2; return 1;; esac done shift $(($OPTIND - 1)) if [[ $# -lt 1 ]]; then error "Must specify a command" - usage >/dev/stderr + usage >&2 return 1 fi mode=$1 if ! in_array "$mode" "${commands[@]}"; then error "Unrecognized command: %s" "$mode" - usage >/dev/stderr + usage >&2 return 1 fi shift @@ -243,14 +243,14 @@ main() { noop|make|sync|delete|update|enter|clean-pkgs|clean-repo) if [[ $# -gt 0 ]]; then error 'Command `%s` does not take any arguments: %s' "$mode" "$*" - usage >/dev/stderr + usage >&2 return 1 fi :;; install-file) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one file' "$mode" - usage >/dev/stderr + usage >&2 return 1 else local missing=() @@ -269,14 +269,14 @@ main() { install-name) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one package name' "$mode" - usage >/dev/stderr + usage >&2 return 1 fi :;; run) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one argument' "$mode" - usage >/dev/stderr + usage >&2 return 1 fi :;; diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 267d32d..7858611 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -137,7 +137,7 @@ if [[ "${0##*/}" == libreblacklist ]]; then } if [[ $# -eq 0 ]]; then - usage >/dev/stderr + usage >&2 exit 1 fi _blacklist_cmd=$1 diff --git a/src/lib/librelib b/src/lib/librelib index 3b05e37..c21532b 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -89,7 +89,7 @@ main() { return 0; fi done - _l print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr + _l print '%s: could not find library: %s' "$cmd" "$lib" >&2 return 1 } diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 87a55cd..5556ddd 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -161,7 +161,7 @@ main() { dlcmd="${dlcmd//\%o/$(printf '%q' "$dst")}" dlcmd="${dlcmd//\%u/$(printf '%q' "$src")}" - { eval "$dlcmd"; } >> /dev/stderr && return 0 + { eval "$dlcmd"; } >&2 && return 0 fi # Mode: create ######################################################### @@ -173,7 +173,7 @@ main() { export pkg_file=$dst cd "$BUILDFILEDIR" - "$makepkg" "${makepkg_opts[@]}" -p "$srcbuild" >> /dev/stderr || return $? + "$makepkg" "${makepkg_opts[@]}" -p "$srcbuild" >&2 || return $? fi } @@ -235,15 +235,15 @@ parse_options() { :;; checksums|print) # don't take any extra arguments if [[ ${#extra_opts[@]} != 0 ]]; then - print "%s: found extra non-flag arguments: %s" "$cmd" "${extra_opts[*]}" >> /dev/stderr - usage >> /dev/stderr + print "%s: found extra non-flag arguments: %s" "$cmd" "${extra_opts[*]}" >&2 + usage >&2 return 1 fi ;; *download*|*create*) # take 1 or 2 extra arguments if [[ ${#extra_opts[@]} != 1 ]] && [[ ${#extra_opts[@]} != 2 ]]; then - print "%s: %d non-flag arguments found, expected 1 or 2: %s" "$cmd" ${#extra_opts[@]} >> /dev/stderr - usage >> /dev/stderr + print "%s: %d non-flag arguments found, expected 1 or 2: %s" "$cmd" ${#extra_opts[@]} >&2 + usage >&2 return 1 fi ;; -- cgit v1.2.3-54-g00ecf 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 +- src/abslibre-tools/librestage | 2 +- src/aur | 2 +- src/chroot-tools/distcc-tool | 2 +- src/chroot-tools/librechroot | 2 +- src/chroot-tools/libremakepkg | 2 +- src/fullpkg/fullpkg-find | 2 +- src/lib/conf.sh | 2 +- src/lib/libreblacklist | 2 +- src/lib/librelib | 2 +- src/lib/libremessages | 2 +- src/librefetch/librefetch | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/lib') 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 diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 4ea6edc..4a21133 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -3,7 +3,7 @@ # Prepares packages for upload # Copyright 2010-2011 Nicolás Reynolds -# Copyright 2013 Luke Shumaker +# Copyright 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/aur b/src/aur index 2d1efbb..a335b04 100755 --- a/src/aur +++ b/src/aur @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright 2010 Joshua Ismael # Copyright 2010 Nicolás Reynolds -# Copyright 2013 Luke Shumaker +# Copyright 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/distcc-tool b/src/chroot-tools/distcc-tool index 29f0128..e114d11 100755 --- a/src/chroot-tools/distcc-tool +++ b/src/chroot-tools/distcc-tool @@ -2,7 +2,7 @@ # -*- tab-width: 4; sh-basic-offset: 4 -*- # distcc-tool -# Copyright 2013 Luke Shumaker +# Copyright 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0f0ed10..73fb6b7 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -4,7 +4,7 @@ set -euE # Copyright 2010 Nicolás Reynolds # Copyright 2011 Joshua Haase -# Copyright 2012-2013 Luke Shumaker +# Copyright 2012-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 96f86ab..c838288 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -4,7 +4,7 @@ set -euE # Copyright 2010-2011 Nicolás Reynolds # Copyright 2011 Joshua Ismael Haase Hernández -# Copyright 2012-2013 Luke Shumaker +# Copyright 2012-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index f1b9573..a47717b 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -4,7 +4,7 @@ # Copyright (c) 2011-2012 Joshua I. Haase H. (xihh) # Copyright (c) 2011-2012 Nicolás Reynolds # Copyright (c) 2012 Michał Masłowski -# Copyright (c) 2012-2013 Luke Shumaker +# Copyright (c) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (c) 2007 Armin Luntzer diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 6b1ab49..cdba893 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -1,7 +1,7 @@ #!/bin/bash # non-executable, but put this there as a hint to text editors # This may be included with or without `set -euE` -# Copyright (c) 2012-2013 by Luke Shumaker +# Copyright (c) 2012-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 7858611..5305896 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -2,7 +2,7 @@ # This may be included with or without `set -euE` # When run directly, it does `set -euE` -# Copyright (c) 2013 by Luke Shumaker +# Copyright (c) 2013-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/librelib b/src/lib/librelib index c21532b..e9c8c8b 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2013 by Luke Shumaker +# Copyright (c) 2013-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libremessages b/src/lib/libremessages index df0a98a..3ce0243 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -10,7 +10,7 @@ # Copyright (c) 2006 by Andras Voroskoi # Copyright (c) 2006 by Miklos Vajna # Copyright (c) 2011 by Joshua Haase -# Copyright (c) 2012-2013 by Luke Shumaker +# Copyright (c) 2012-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 443b4f6..90c40db 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # librefetch # -# Copyright 2013 Luke Shumaker +# Copyright 2013-2014 Luke Shumaker # # This file is part of Parabola. # -- cgit v1.2.3-54-g00ecf 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/createworkdir | 4 ++-- src/abslibre-tools/diff-unfree | 2 +- src/abslibre-tools/librerelease | 32 ++++++++++++------------- src/abslibre-tools/librestage | 4 ++-- src/aur | 6 ++--- src/chroot-tools/chcleanup | 2 +- src/chroot-tools/distcc-tool | 2 +- src/chroot-tools/librechroot | 6 ++--- src/chroot-tools/libremakepkg | 6 ++--- src/fullpkg/fullpkg-find | 52 ++++++++++++++++++++-------------------- src/gitget/gitget | 4 ++-- src/gitget/libregit | 2 +- src/lib/conf.sh | 2 +- src/lib/libreblacklist | 2 +- src/lib/librelib | 2 +- src/lib/libremessages | 18 +++++++------- src/librefetch/librefetch | 2 +- src/pkgbuild-check-nonfree | 10 ++++---- src/treepkg | 2 +- 19 files changed, 80 insertions(+), 80 deletions(-) (limited to 'src/lib') diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 4421ae2..27b285c 100755 --- a/src/abslibre-tools/createworkdir +++ b/src/abslibre-tools/createworkdir @@ -3,8 +3,8 @@ set -euE # CreateWorkDir # Creates a dir structure for working with Parabola packages -# Copyright 2010 Nicolás Reynolds -# Copyright 2013 Luke Shumaker +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013 Luke Shumaker # ---------- GNU General Public License 3 ---------- diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree index 1ef0649..af5bbe5 100755 --- a/src/abslibre-tools/diff-unfree +++ b/src/abslibre-tools/diff-unfree @@ -1,7 +1,7 @@ #!/usr/bin/env bash # This script will help you diff a *-libre PKGBUILD against the unfree one # to check for updates. -# Copyright 2010 Nicolás Reynolds +# Copyright (C) 2010 Nicolás Reynolds # ---------- GNU General Public License 3 ---------- 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. # diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 4a21133..610de50 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -2,8 +2,8 @@ # LibreStage # Prepares packages for upload -# Copyright 2010-2011 Nicolás Reynolds -# Copyright 2013-2014 Luke Shumaker +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/aur b/src/aur index a335b04..988d33f 100755 --- a/src/aur +++ b/src/aur @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Copyright 2010 Joshua Ismael -# Copyright 2010 Nicolás Reynolds -# Copyright 2013-2014 Luke Shumaker +# Copyright (C) 2010 Joshua Ismael +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 2ff45f9..9ad121e 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eE -# (c) Nicolás Reynolds +# Copyright (C) Nicolás Reynolds # Released under GPLv3 # # Performs chroot cleanup smartly, it only removes the unneeded packages or diff --git a/src/chroot-tools/distcc-tool b/src/chroot-tools/distcc-tool index e114d11..9f78ead 100755 --- a/src/chroot-tools/distcc-tool +++ b/src/chroot-tools/distcc-tool @@ -2,7 +2,7 @@ # -*- tab-width: 4; sh-basic-offset: 4 -*- # distcc-tool -# Copyright 2013-2014 Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 73fb6b7..7b1e4a9 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -2,9 +2,9 @@ set -euE # librechroot -# Copyright 2010 Nicolás Reynolds -# Copyright 2011 Joshua Haase -# Copyright 2012-2014 Luke Shumaker +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2011 Joshua Haase +# Copyright (C) 2012-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index c838288..d6db0fd 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -2,9 +2,9 @@ set -euE # libremakepkg -# Copyright 2010-2011 Nicolás Reynolds -# Copyright 2011 Joshua Ismael Haase Hernández -# Copyright 2012-2014 Luke Shumaker +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández +# Copyright (C) 2012-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index a47717b..8bd630c 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -1,34 +1,34 @@ #!/usr/bin/env bash # set -x # uncomment for debug -# Copyright (c) 2011-2012 Joshua I. Haase H. (xihh) -# Copyright (c) 2011-2012 Nicolás Reynolds -# Copyright (c) 2012 Michał Masłowski -# Copyright (c) 2012-2014 Luke Shumaker +# Copyright (C) 2011-2012 Joshua I. Haase H. (xihh) +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012 Michał Masłowski +# Copyright (C) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: -# Copyright (c) 2007 Armin Luntzer -# Copyright (c) 2007 Jason Chu -# Copyright (c) 2007, 2011 Dan McGee -# Copyright (c) 2007-2008 Travis Willard -# Copyright (c) 2007-2009 Aaron Griffin -# Copyright (c) 2008 Simo Leone -# Copyright (c) 2009 Biru Ionut -# Copyright (c) 2009 Biru Ionut -# Copyright (c) 2009 Evangelos Foutras -# Copyright (c) 2009 Francois Charette -# Copyright (c) 2009 Nezmer -# Copyright (c) 2009 Ronald van Haren -# Copyright (c) 2009-2011 Andrea Scarpino -# Copyright (c) 2009-2012 Allan McRae -# Copyright (c) 2009-2012 Eric Bélanger -# Copyright (c) 2009-2012 Pierre Schmitz -# Copyright (c) 2010 Byron Clark -# Copyright (c) 2011 Ionut Biru -# Copyright (c) 2011 Lukas Fleischer -# Copyright (c) 2011-2012 Florian Pritz -# Copyright (c) 2011-2013 Jan Alexander Steffens (heftig) -# Copyright (c) 2013 Sébastien Luttringer +# Copyright (C) 2007 Armin Luntzer +# Copyright (C) 2007 Jason Chu +# Copyright (C) 2007, 2011 Dan McGee +# Copyright (C) 2007-2008 Travis Willard +# Copyright (C) 2007-2009 Aaron Griffin +# Copyright (C) 2008 Simo Leone +# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Evangelos Foutras +# Copyright (C) 2009 Francois Charette +# Copyright (C) 2009 Nezmer +# Copyright (C) 2009 Ronald van Haren +# Copyright (C) 2009-2011 Andrea Scarpino +# Copyright (C) 2009-2012 Allan McRae +# Copyright (C) 2009-2012 Eric Bélanger +# Copyright (C) 2009-2012 Pierre Schmitz +# Copyright (C) 2010 Byron Clark +# Copyright (C) 2011 Ionut Biru +# Copyright (C) 2011 Lukas Fleischer +# Copyright (C) 2011-2012 Florian Pritz +# Copyright (C) 2011-2013 Jan Alexander Steffens (heftig) +# Copyright (C) 2013 Sébastien Luttringer # # Because of the code from makechrootpkg, this file is GPLv2, instead of GPLv3 # like most of libretools. diff --git a/src/gitget/gitget b/src/gitget/gitget index 194ec05..3e35cec 100755 --- a/src/gitget/gitget +++ b/src/gitget/gitget @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Copyright (c) 2012-2013 Pacman Development Team -# Copyright (c) 2012-2013 Luke Shumaker +# Copyright (C) 2012-2013 Pacman Development Team +# Copyright (C) 2012-2013 Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/gitget/libregit b/src/gitget/libregit index f89a402..95b59ff 100755 --- a/src/gitget/libregit +++ b/src/gitget/libregit @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2012-2013 Luke Shumaker +# Copyright (C) 2012-2013 Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/conf.sh b/src/lib/conf.sh index cdba893..ee52f6f 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -1,7 +1,7 @@ #!/bin/bash # non-executable, but put this there as a hint to text editors # This may be included with or without `set -euE` -# Copyright (c) 2012-2014 by Luke Shumaker +# Copyright (C) 2012-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 5305896..5525098 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -2,7 +2,7 @@ # This may be included with or without `set -euE` # When run directly, it does `set -euE` -# Copyright (c) 2013-2014 by Luke Shumaker +# Copyright (C) 2013-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/librelib b/src/lib/librelib index e9c8c8b..d0a06e5 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2013-2014 by Luke Shumaker +# Copyright (C) 2013-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libremessages b/src/lib/libremessages index 3ce0243..e5b7157 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -2,15 +2,15 @@ # This may be included with or without `set -euE` # When run directly, it does `set -euE` -# Copyright (c) 2002-2006 by Judd Vinet -# Copyright (c) 2006-2010 Pacman Development Team -# Copyright (c) 2005 by Aurelien Foret -# Copyright (c) 2005 by Christian Hamar -# Copyright (c) 2006 by Alex Smith -# Copyright (c) 2006 by Andras Voroskoi -# Copyright (c) 2006 by Miklos Vajna -# Copyright (c) 2011 by Joshua Haase -# Copyright (c) 2012-2014 by Luke Shumaker +# Copyright (C) 2002-2006 by Judd Vinet +# Copyright (C) 2006-2010 Pacman Development Team +# Copyright (C) 2005 by Aurelien Foret +# Copyright (C) 2005 by Christian Hamar +# Copyright (C) 2006 by Alex Smith +# Copyright (C) 2006 by Andras Voroskoi +# Copyright (C) 2006 by Miklos Vajna +# Copyright (C) 2011 by Joshua Haase +# Copyright (C) 2012-2014 by Luke Shumaker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 90c40db..4ecc8fe 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # librefetch # -# Copyright 2013-2014 Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree index 18fac91..7b73745 100755 --- a/src/pkgbuild-check-nonfree +++ b/src/pkgbuild-check-nonfree @@ -2,11 +2,11 @@ # -*- tab-width: 4 ; sh-basic-offset: 4 -*- # pkgbuild-check-nonfree -# Copyright 2010 Haase Hernández -# Copyright 2010 Joseph Graham -# Copyright 2010 Joshua Ismael -# Copyright 2010 Nicolás Reynolds -# Copyright 2012-2013 Luke Shumaker +# Copyright (C) 2010 Haase Hernández +# Copyright (C) 2010 Joseph Graham +# Copyright (C) 2010 Joshua Ismael +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2012-2013 Luke Shumaker # # This file is part of Parabola. # diff --git a/src/treepkg b/src/treepkg index 8879e54..1826c8f 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,6 @@ #!/usr/bin/env bash #set -x -# (c) 2012 Nicolás Reynolds +# Copyright (C) 2012 Nicolás Reynolds # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3-54-g00ecf From e3108aeb1e38e9d6b243015344c6b4d856221fb4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Feb 2014 04:16:17 -0500 Subject: src/lib/Makefile: fix extra files from being included in libexecs --- src/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/Makefile b/src/lib/Makefile index 4ed5e4f..495abb1 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -1,5 +1,5 @@ copy_files = common.sh.in -libexecs = $(filter-out librelib,$(wildcard libre*)) +libexecs = $(filter-out librelib,$(progs)) # include common.sh in libs explicitly, because it might not exist yet # when the wildcard is performed libs = $(sort $(wildcard *.sh) common.sh) -- cgit v1.2.3-54-g00ecf From 74f68d0149f2a94780c860b0775d1e880dbe9225 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Mar 2014 10:57:57 -0500 Subject: teach libremessages:setup_traps to be able to use a custom signal handler --- src/lib/libremessages | 31 ++++++++++++++++++++++--------- src/lib/libremessages.1.ronn | 9 +++++++-- 2 files changed, 29 insertions(+), 11 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libremessages b/src/lib/libremessages index e5b7157..162c8fb 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -117,17 +117,30 @@ term_title() { printf "$fmt" "$*" } -# Usage: setup_traps +# Usage: setup_traps [handler] # Sets up traps on TERM, HUP, QUIT and INT signals, as well as the ERR event, -# similar to makepkg +# similar to makepkg. +# +# If `handler` is specified, instead of using the default handler +# (which is good for most purposes), it will call the command handler +# with the arguments: +# +# ${handler} SIGNAL_NAME MESSAGE_FMT [MESSAGE_PARAMS...] +# +# where MESSAGE_* are printf-like stuff. setup_traps() { - _libremessages_trap_exit() { - local signal=$1; shift - echo - error "$@" - trap -- "$signal" - kill "-$signal" "$$" - } + [[ $# -le 1 ]] || panic + if [[ $# == 1 ]]; then + eval "_libremessages_trap_exit() { $1 \"\$@\"; }" + else + _libremessages_trap_exit() { + local signal=$1; shift + echo + error "$@" + trap -- "$signal" + kill "-$signal" "$$" + } + fi set -E for signal in TERM HUP QUIT; do trap "_libremessages_trap_exit $signal '%s signal caught. Exiting...' $signal" $signal diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn index d4c35fc..d39dad0 100644 --- a/src/lib/libremessages.1.ronn +++ b/src/lib/libremessages.1.ronn @@ -69,9 +69,14 @@ Unless otherwise noted, these do not implicitly call `gettext`. Joins all arguments with whitespace, and sets the terminal title to that. - * `setup_traps`: + * `setup_traps` []: Sets traps on TERM, HUP, QUIT and INT signals, as sell as the ERR - event, similar to makepkg. + event, similar to makepkg. If is specified, instead of + using the default handler (which is good for most purposes), it + will call with the arguments + ` [...]`, where + is a `printf`(1)-formatted string, and + are its arguments. ### PROSE ROUTINES -- cgit v1.2.3-54-g00ecf 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/createworkdir | 19 +++++++------- src/abslibre-tools/diff-unfree | 13 +++++----- src/abslibre-tools/libreaddiff | 8 ++++-- src/abslibre-tools/librerelease | 29 ++++++++++----------- src/abslibre-tools/librestage | 6 +++-- src/aur | 10 +++++--- src/chroot-tools/arch-nspawn.patch | 9 +++++++ src/chroot-tools/chcleanup | 18 +++++++++++-- src/chroot-tools/distcc-tool | 4 ++- src/chroot-tools/hooks-distcc.sh | 19 ++++++++++++++ src/chroot-tools/indent | 19 ++++++++++++++ src/chroot-tools/librechroot | 8 +++--- src/chroot-tools/libremakepkg | 8 +++--- src/chroot-tools/makechrootpkg.sh.patch | 45 +++++++++++++++++++-------------- src/chroot-tools/mkarchroot.patch | 15 ++++++++--- src/dagpkg | 4 ++- src/devtools/checkpkg.patch | 10 +++++--- src/devtools/find-libdeps.patch | 9 ++++--- src/devtools/finddeps.patch | 8 +++--- src/devtools/lddd.patch | 8 +++--- src/fullpkg/fullpkg | 6 ++++- src/fullpkg/fullpkg-build | 5 ++++ src/fullpkg/fullpkg-find | 11 ++++---- src/gitget/gitget | 2 ++ src/gitget/libregit | 2 ++ src/is_built | 20 +++++++++++++++ src/lib/common.sh.top | 9 +------ src/lib/conf.sh | 4 ++- src/lib/libreblacklist | 4 ++- src/lib/librelib | 4 ++- src/lib/libremessages | 43 ++++++++++++++++++------------- src/librefetch/librefetch | 2 ++ src/mips64el-tools/librebasebuilder | 5 +++- src/mips64el-tools/mipsrelease | 21 +++++++++++++-- src/pkgbuild-check-nonfree | 11 ++++---- src/pkgbuild-summarize-nonfree | 18 +++++++++++++ src/repo-diff | 4 +++ src/toru/toru | 20 ++++++++++++++- src/toru/toru-info | 5 ++++ src/toru/toru-path | 4 +++ src/toru/toru-utils | 5 ++++ src/toru/toru-where | 5 ++++ src/treepkg | 6 +++-- 43 files changed, 354 insertions(+), 131 deletions(-) create mode 100644 src/chroot-tools/arch-nspawn.patch (limited to 'src/lib') diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 27b285c..51863e3 100755 --- a/src/abslibre-tools/createworkdir +++ b/src/abslibre-tools/createworkdir @@ -1,28 +1,29 @@ #!/usr/bin/env bash -set -euE # CreateWorkDir # Creates a dir structure for working with Parabola packages -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2013 Luke Shumaker - -# ---------- GNU General Public License 3 ---------- - +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3+ +# # This file is part of Parabola. - +# # Parabola is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # Parabola is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . +set -euE + . libremessages . $(librelib conf.sh) load_files libretools diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree index af5bbe5..e8c18e6 100755 --- a/src/abslibre-tools/diff-unfree +++ b/src/abslibre-tools/diff-unfree @@ -1,22 +1,23 @@ #!/usr/bin/env bash # This script will help you diff a *-libre PKGBUILD against the unfree one # to check for updates. -# Copyright (C) 2010 Nicolás Reynolds - -# ---------- GNU General Public License 3 ---------- +# Copyright (C) 2010 Nicolás Reynolds +# +# License: GNU GPLv3+ +# # This file is part of Parabola. - +# # Parabola is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # Parabola is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff index ebd749d..641f552 100755 --- a/src/abslibre-tools/libreaddiff +++ b/src/abslibre-tools/libreaddiff @@ -1,7 +1,9 @@ #!/usr/bin/env bash -set -e # -*- coding: utf-8 -*- -# Copyright (C) 2011, 2012 Michał Masłowski + +# Copyright (C) 2011-2012 Michał Masłowski +# +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,6 +18,8 @@ set -e # You should have received a copy of the GNU General Public License # along with this program. If not, see . +set -e + . $(librelib conf.sh) load_files libretools check_vars libretools WORKDIR 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) diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 610de50..6ae0af0 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -2,8 +2,10 @@ # LibreStage # Prepares packages for upload -# Copyright (C) 2010-2011 Nicolás Reynolds -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # diff --git a/src/aur b/src/aur index 988d33f..72857ed 100755 --- a/src/aur +++ b/src/aur @@ -1,7 +1,9 @@ #!/usr/bin/env bash -# Copyright (C) 2010 Joshua Ismael -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2010 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2013-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # @@ -9,7 +11,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # Parabola is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch new file mode 100644 index 0000000..afdf51a --- /dev/null +++ b/src/chroot-tools/arch-nspawn.patch @@ -0,0 +1,9 @@ +--- arch-nspawn.in 2014-03-21 13:59:31.812992892 -0400 ++++ arch-nspawn 2014-03-21 14:24:23.520619552 -0400 +@@ -1,4 +1,6 @@ + #!/bin/bash ++# License: GNU GPLv2 ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; version 2 of the License. diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 9ad121e..e766117 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,13 +1,27 @@ #!/usr/bin/env bash -set -eE # Copyright (C) Nicolás Reynolds -# Released under GPLv3 # +# License: GNU GPLv3 +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + # Performs chroot cleanup smartly, it only removes the unneeded packages or # leaves you with a cleansystem # # See: HOOKPREBUILD +set -eE + DRYRUN=${DRYRUN:-false} ################################################################################ diff --git a/src/chroot-tools/distcc-tool b/src/chroot-tools/distcc-tool index 9f78ead..f2e43dd 100755 --- a/src/chroot-tools/distcc-tool +++ b/src/chroot-tools/distcc-tool @@ -2,7 +2,9 @@ # -*- tab-width: 4; sh-basic-offset: 4 -*- # distcc-tool -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # diff --git a/src/chroot-tools/hooks-distcc.sh b/src/chroot-tools/hooks-distcc.sh index d8d708a..445810b 100644 --- a/src/chroot-tools/hooks-distcc.sh +++ b/src/chroot-tools/hooks-distcc.sh @@ -1,4 +1,23 @@ #!/usr/bin/env bash +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3+ +# +# This file is part of Parabola. +# +# Parabola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Parabola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Parabola. If not, see . + set -euE hook_pre_build+=("distcc_start") diff --git a/src/chroot-tools/indent b/src/chroot-tools/indent index 5a7f654..ffec4d5 100755 --- a/src/chroot-tools/indent +++ b/src/chroot-tools/indent @@ -1,4 +1,23 @@ #!/usr/bin/env perl +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3+ +# +# This file is part of Parabola. +# +# Parabola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Parabola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Parabola. If not, see . + use warnings; use strict; use constant BUFFER_SIZE => 40; diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index f449f0d..ca29cbb 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -2,9 +2,11 @@ set -euE # librechroot -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2011 Joshua Haase -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 26080bc..6050174 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -2,9 +2,11 @@ set -euE # libremakepkg -# Copyright (C) 2010-2011 Nicolás Reynolds -# Copyright (C) 2011 Joshua Ismael Haase Hernández -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch index 540e6ba..de57aeb 100644 --- a/src/chroot-tools/makechrootpkg.sh.patch +++ b/src/chroot-tools/makechrootpkg.sh.patch @@ -1,6 +1,13 @@ ---- makechrootpkg.sh.in 2014-01-05 18:51:41.463720929 -0500 -+++ makechrootpkg.sh.ugly 2014-02-09 20:20:25.021630727 -0500 -@@ -12,6 +12,7 @@ +--- makechrootpkg.sh.in 2014-03-21 13:59:31.239683366 -0400 ++++ makechrootpkg.sh.ugly 2014-03-21 14:19:20.747789508 -0400 +@@ -1,4 +1,6 @@ + #!/bin/bash ++# License: GNU GPLv2 ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; version 2 of the License. +@@ -12,6 +14,7 @@ shopt -s nullglob @@ -8,7 +15,7 @@ _makepkg_args=(-s --noconfirm -L --holdver) makepkg_args=("${_makepkg_args[@]}") repack=false -@@ -29,9 +30,10 @@ +@@ -29,9 +32,10 @@ bindmounts_rw=() copy=$USER @@ -20,7 +27,7 @@ usage() { echo "Usage: ${0##*/} [options] -r [--] [makepkg args]" -@@ -67,6 +69,7 @@ +@@ -67,6 +71,7 @@ exit 1 } @@ -28,7 +35,7 @@ while getopts 'hcur:I:l:nTD:d:' arg; do case "$arg" in h) usage ;; -@@ -93,9 +96,6 @@ +@@ -93,9 +98,6 @@ [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" @@ -38,7 +45,7 @@ if [[ ${copy:0:1} = / ]]; then copydir=$copy else -@@ -115,30 +115,48 @@ +@@ -115,30 +117,48 @@ esac done @@ -93,7 +100,7 @@ # Get a read lock on the root chroot to make # sure we don't clone a half-updated chroot slock 8 "$chrootdir/root.lock" "Locking clean chroot" -@@ -159,11 +177,16 @@ +@@ -159,11 +179,16 @@ # Drop the read lock again lock_close 8 @@ -113,7 +120,7 @@ if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then btrfs subvolume delete "$copydir" >/dev/null || die "Unable to delete subvolume %s" "$copydir" -@@ -178,9 +201,14 @@ +@@ -178,9 +203,14 @@ stat_done } @@ -128,7 +135,7 @@ for install_pkg in "${install_pkgs[@]}"; do pkgname="${install_pkg##*/}" cp "$install_pkg" "$copydir/$pkgname" -@@ -193,11 +221,19 @@ +@@ -193,11 +223,19 @@ rm "$copydir/$pkgname" done @@ -150,7 +157,7 @@ $repack || rm -rf "$copydir/build" mkdir -p "$copydir/build" -@@ -236,12 +272,12 @@ +@@ -236,12 +274,12 @@ chown -R nobody "$copydir"/{build,pkgdest,srcpkgdest,logdest,srcdest,startdir} @@ -165,7 +172,7 @@ sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf" echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf" fi -@@ -254,20 +290,38 @@ +@@ -254,20 +292,38 @@ chmod 440 "$copydir/etc/sudoers.d/nobody-pacman" fi @@ -206,7 +213,7 @@ makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o else ( export SRCDEST BUILDDIR="$builddir" -@@ -277,10 +331,10 @@ +@@ -277,10 +333,10 @@ (( $? != 0 )) && die "Could not download sources." # Clean up garbage from verifysource @@ -219,7 +226,7 @@ # This function isn't run in makechrootpkg, # so no global variables local run_namcap="$1"; shift -@@ -291,6 +345,7 @@ +@@ -291,6 +347,7 @@ shopt -s nullglob # XXX: Workaround makepkg disliking read-only dirs @@ -227,7 +234,7 @@ ln -sft /srcdest /srcdest_host/* ln -sft /startdir /startdir_host/* -@@ -316,11 +371,29 @@ +@@ -316,11 +373,29 @@ # Safety check if [[ ! -w PKGBUILD ]]; then @@ -258,7 +265,7 @@ if $run_namcap; then pacman -S --needed --noconfirm namcap -@@ -333,12 +406,24 @@ +@@ -333,12 +408,24 @@ exit 0 } @@ -283,7 +290,7 @@ for l in "$copydir"/logdest/*; do [[ $l == */logpipe.* ]] && continue chown "$src_owner" "$l" -@@ -352,6 +437,10 @@ +@@ -352,6 +439,10 @@ } # }}} @@ -294,7 +301,7 @@ umask 0022 load_vars /etc/makepkg.conf -@@ -363,30 +452,45 @@ +@@ -363,30 +454,45 @@ [[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD [[ -d $LOGDEST ]] || LOGDEST=$PWD @@ -346,7 +353,7 @@ if (( ret != 0 )); then if $temp_chroot; then -@@ -397,3 +501,4 @@ +@@ -397,3 +503,4 @@ else true fi diff --git a/src/chroot-tools/mkarchroot.patch b/src/chroot-tools/mkarchroot.patch index a0ea0f0..171b38a 100644 --- a/src/chroot-tools/mkarchroot.patch +++ b/src/chroot-tools/mkarchroot.patch @@ -1,6 +1,13 @@ ---- mkarchroot.in 2014-01-05 18:51:15.231500986 -0500 -+++ mkarchroot 2014-03-20 15:05:06.885086610 -0400 -@@ -65,6 +65,11 @@ +--- mkarchroot.in 2014-03-21 13:59:31.593002027 -0400 ++++ mkarchroot.ugly 2014-03-21 14:23:12.027238102 -0400 +@@ -1,4 +1,6 @@ + #!/bin/bash ++# License: GNU GPLv2 ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; version 2 of the License. +@@ -65,6 +67,11 @@ chmod 0755 "$working_dir" fi @@ -12,7 +19,7 @@ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' -@@ -72,7 +77,7 @@ +@@ -72,7 +79,7 @@ echo 'LANG=C' > "$working_dir/etc/locale.conf" echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" diff --git a/src/dagpkg b/src/dagpkg index 8e997a6..e1487d5 100755 --- a/src/dagpkg +++ b/src/dagpkg @@ -2,10 +2,12 @@ # # dagpkg - create a directed graph of package dependencies and build # them in topological order -# + # Copyright (C) 2014 Nicolás Reynolds # Copyright (C) 2014 Michał Masłowski # +# License: GNU GPLv3+ +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/src/devtools/checkpkg.patch b/src/devtools/checkpkg.patch index fe9568e..2e3bb63 100644 --- a/src/devtools/checkpkg.patch +++ b/src/devtools/checkpkg.patch @@ -1,6 +1,8 @@ ---- checkpkg.in 2014-03-20 15:55:50.091249246 -0400 -+++ checkpkg 2014-03-21 00:27:07.318339210 -0400 -@@ -2,7 +2,28 @@ +--- checkpkg.in 2014-03-21 13:59:31.849658036 -0400 ++++ checkpkg.ugly 2014-03-21 14:20:52.340291982 -0400 +@@ -1,8 +1,30 @@ + #!/bin/bash ++# License: Unspecified shopt -s extglob @@ -30,7 +32,7 @@ # Source makepkg.conf; fail if it is not found if [[ -r '/etc/makepkg.conf' ]]; then -@@ -17,7 +38,9 @@ +@@ -17,7 +39,9 @@ fi if [[ ! -f PKGBUILD ]]; then diff --git a/src/devtools/find-libdeps.patch b/src/devtools/find-libdeps.patch index 2b2ce2a..fe8e2fe 100644 --- a/src/devtools/find-libdeps.patch +++ b/src/devtools/find-libdeps.patch @@ -1,14 +1,15 @@ ---- find-libdeps.in 2014-03-20 15:55:50.107915156 -0400 -+++ find-libdeps 2014-03-21 00:09:03.855031377 -0400 -@@ -1,6 +1,6 @@ +--- find-libdeps.in 2014-03-21 13:59:32.059649315 -0400 ++++ find-libdeps.ugly 2014-03-21 14:21:18.955744982 -0400 +@@ -1,6 +1,7 @@ #!/bin/bash ++# License: Unspecified -m4_include(lib/common.sh) +. $(librelib messages) set -e shopt -s extglob -@@ -19,12 +19,32 @@ +@@ -19,12 +20,32 @@ *) die "Unknown mode %s" "$script_mode" ;; esac diff --git a/src/devtools/finddeps.patch b/src/devtools/finddeps.patch index a960ac1..feae920 100644 --- a/src/devtools/finddeps.patch +++ b/src/devtools/finddeps.patch @@ -1,8 +1,10 @@ ---- finddeps.in 2014-03-20 15:55:50.121247884 -0400 -+++ finddeps 2014-03-21 00:11:02.573978735 -0400 -@@ -3,18 +3,24 @@ +--- finddeps.in 2014-03-21 13:59:32.249641424 -0400 ++++ finddeps.ugly 2014-03-21 14:21:09.949489174 -0400 +@@ -2,19 +2,26 @@ + # # finddeps - find packages that depend on a given depname # ++# License: Unspecified -m4_include(lib/common.sh) +. $(librelib messages) diff --git a/src/devtools/lddd.patch b/src/devtools/lddd.patch index 7ae1679..415b178 100644 --- a/src/devtools/lddd.patch +++ b/src/devtools/lddd.patch @@ -1,8 +1,10 @@ ---- lddd.in 2014-03-20 15:55:50.154579704 -0400 -+++ lddd 2014-03-21 00:35:07.167279204 -0400 -@@ -3,7 +3,23 @@ +--- lddd.in 2014-03-21 13:59:32.419634364 -0400 ++++ lddd.ugly 2014-03-21 14:21:31.538503947 -0400 +@@ -2,8 +2,25 @@ + # # lddd - find broken library links on your machine # ++# License: Unspecified -m4_include(lib/common.sh) +. $(librelib messages) diff --git a/src/fullpkg/fullpkg b/src/fullpkg/fullpkg index 978cf7b..0572ddb 100755 --- a/src/fullpkg/fullpkg +++ b/src/fullpkg/fullpkg @@ -1,8 +1,12 @@ #!/usr/bin/env bash -# set -x # uncomment for debug # Builds packages from ABS recursively. It tries to find dependencies that # aren't built or need update and then makepkg them in order. +# Copyright (C) 2011 Nicolás Reynolds +# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) +# +# License: Unspecified + usage() { print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}" print "A (libre)makepkg wrapper that will also build dependencies" diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build index e824c2e..0ffd42a 100755 --- a/src/fullpkg/fullpkg-build +++ b/src/fullpkg/fullpkg-build @@ -3,6 +3,11 @@ # Builds packages from ABS recursively. It tries to find dependencies that # aren't built or need update and then makepkg them in order. +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2013 Luke Shumaker +# +# License: Unspecified + # TODO move __build to chroot . libremessages diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index 8bd630c..009bb86 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -1,10 +1,10 @@ #!/usr/bin/env bash # set -x # uncomment for debug -# Copyright (C) 2011-2012 Joshua I. Haase H. (xihh) -# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Michał Masłowski -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (C) 2007 Armin Luntzer @@ -13,8 +13,7 @@ # Copyright (C) 2007-2008 Travis Willard # Copyright (C) 2007-2009 Aaron Griffin # Copyright (C) 2008 Simo Leone -# Copyright (C) 2009 Biru Ionut -# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Biru Ionut # Copyright (C) 2009 Evangelos Foutras # Copyright (C) 2009 Francois Charette # Copyright (C) 2009 Nezmer @@ -33,6 +32,8 @@ # Because of the code from makechrootpkg, this file is GPLv2, instead of GPLv3 # like most of libretools. # +# License: GNU GPLv2 +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. diff --git a/src/gitget/gitget b/src/gitget/gitget index 3e35cec..bcc528c 100755 --- a/src/gitget/gitget +++ b/src/gitget/gitget @@ -3,6 +3,8 @@ # Copyright (C) 2012-2013 Pacman Development Team # Copyright (C) 2012-2013 Luke Shumaker # +# License: GNU GPLv2+ +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or diff --git a/src/gitget/libregit b/src/gitget/libregit index 95b59ff..25550e5 100755 --- a/src/gitget/libregit +++ b/src/gitget/libregit @@ -2,6 +2,8 @@ # Copyright (C) 2012-2013 Luke Shumaker # +# License: GNU GPLv2+ +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or diff --git a/src/is_built b/src/is_built index ba5f061..21b17d3 100755 --- a/src/is_built +++ b/src/is_built @@ -1,4 +1,24 @@ #!/usr/bin/env bash +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012-2013 Luke Shumaker +# +# License: GNU GPLv3+ +# +# This file is part of Parabola. +# +# Parabola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Parabola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Parabola. If not, see . . libremessages diff --git a/src/lib/common.sh.top b/src/lib/common.sh.top index 9c4ba2e..d45a7dd 100644 --- a/src/lib/common.sh.top +++ b/src/lib/common.sh.top @@ -4,14 +4,7 @@ # This file is included by libremessages. # You should probably use libremessages instead of this. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# License: Unspecified shopt -s extglob diff --git a/src/lib/conf.sh b/src/lib/conf.sh index ee52f6f..3e07c11 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -1,7 +1,9 @@ #!/bin/bash # non-executable, but put this there as a hint to text editors # This may be included with or without `set -euE` -# Copyright (C) 2012-2014 by Luke Shumaker +# Copyright (C) 2012-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 5525098..fdd27f9 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -2,7 +2,9 @@ # This may be included with or without `set -euE` # When run directly, it does `set -euE` -# Copyright (C) 2013-2014 by Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/librelib b/src/lib/librelib index d0a06e5..63d9a26 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -1,5 +1,7 @@ #!/usr/bin/env bash -# Copyright (C) 2013-2014 by Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker +# +# License: GNU GPLv3+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/lib/libremessages b/src/lib/libremessages index 162c8fb..71f1636 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -2,28 +2,35 @@ # This may be included with or without `set -euE` # When run directly, it does `set -euE` -# Copyright (C) 2002-2006 by Judd Vinet +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012-2014 Luke Shumaker + +# For just the setup_traps() function: +# Copyright (C) 2002-2006 Judd Vinet # Copyright (C) 2006-2010 Pacman Development Team -# Copyright (C) 2005 by Aurelien Foret -# Copyright (C) 2005 by Christian Hamar -# Copyright (C) 2006 by Alex Smith -# Copyright (C) 2006 by Andras Voroskoi -# Copyright (C) 2006 by Miklos Vajna -# Copyright (C) 2011 by Joshua Haase -# Copyright (C) 2012-2014 by Luke Shumaker +# Copyright (C) 2005 Aurelien Foret +# Copyright (C) 2005 Christian Hamar +# Copyright (C) 2006 Alex Smith +# Copyright (C) 2006 Andras Voroskoi +# Copyright (C) 2006 Miklos Vajna +# +# License: GNU GPLv3+ # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# setup_traps() is based on pacman:makepkg, which is GPLv2+, +# so we take the '+' to combine it with our GPLv3+. ################################################################################ # Inherit most functions from devtools # diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 82c8703..4f2d788 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -3,6 +3,8 @@ # # Copyright (C) 2013-2014 Luke Shumaker # +# License: GNU GPLv3+ +# # This file is part of Parabola. # # Parabola is free software: you can redistribute it and/or modify diff --git a/src/mips64el-tools/librebasebuilder b/src/mips64el-tools/librebasebuilder index 6b8c8bb..34c1027 100755 --- a/src/mips64el-tools/librebasebuilder +++ b/src/mips64el-tools/librebasebuilder @@ -1,6 +1,9 @@ #!/usr/bin/env bash # -*- coding: utf-8 -*- -# Copyright (C) 2012 Michał Masłowski + +# Copyright (C) 2012 Michał Masłowski +# +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/mips64el-tools/mipsrelease b/src/mips64el-tools/mipsrelease index ea15f85..f8b77a8 100755 --- a/src/mips64el-tools/mipsrelease +++ b/src/mips64el-tools/mipsrelease @@ -1,9 +1,26 @@ #!/usr/bin/env bash -# Lic: GPLv3+ -# Author: Nicolas Reynolds # Local release of mips64el packages + clean ABS sync # Called by HOOKLOCALRELEASE +# Copyright (C) 2011 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + # $1 repo # $2+ packages diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree index 7b73745..aa56d71 100755 --- a/src/pkgbuild-check-nonfree +++ b/src/pkgbuild-check-nonfree @@ -2,11 +2,12 @@ # -*- tab-width: 4 ; sh-basic-offset: 4 -*- # pkgbuild-check-nonfree -# Copyright (C) 2010 Haase Hernández -# Copyright (C) 2010 Joseph Graham -# Copyright (C) 2010 Joshua Ismael -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2012-2013 Luke Shumaker +# Copyright (C) 2010 Joseph Graham (Xylon) +# Copyright (C) 2010 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2012-2013 Luke Shumaker +# +# License: GNU GPLv3+ # # This file is part of Parabola. # diff --git a/src/pkgbuild-summarize-nonfree b/src/pkgbuild-summarize-nonfree index 7b005d5..cf3be28 100755 --- a/src/pkgbuild-summarize-nonfree +++ b/src/pkgbuild-summarize-nonfree @@ -1,4 +1,22 @@ #!/bin/bash +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3+ +# +# This file is part of Parabola. +# +# Parabola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Parabola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Parabola. If not, see . . $(librelib messages) diff --git a/src/repo-diff b/src/repo-diff index e15080a..d25983a 100755 --- a/src/repo-diff +++ b/src/repo-diff @@ -1,6 +1,10 @@ #!/usr/bin/env bash # Shows a diff between repo databases +# Copyright (C) 2013 Nicolás Reynolds +# +# License: Unspecified + . libremessages usage() { diff --git a/src/toru/toru b/src/toru/toru index 3c45efd..16ec4af 100755 --- a/src/toru/toru +++ b/src/toru/toru @@ -1,6 +1,24 @@ #!/usr/bin/env bash # Queries the ABS -# License: GPL3 + +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012-2013 Michał Masłowski +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv3 +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . ## TODO # * Add license text diff --git a/src/toru/toru-info b/src/toru/toru-info index d73d2ad..aa84fcf 100755 --- a/src/toru/toru-info +++ b/src/toru/toru-info @@ -1,5 +1,10 @@ #!/usr/bin/env bash # Prints info about a given pkgname + +# Copyright (C) 2012 Nicolás Reynolds +# +# License: Unspecified + . libremessages . $(librelib conf) diff --git a/src/toru/toru-path b/src/toru/toru-path index 6c86e88..407059b 100755 --- a/src/toru/toru-path +++ b/src/toru/toru-path @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# Copyright (C) 2011-2012 Nicolás Reynolds +# +# License: Unspecified + source toru-utils TORUPATH=${T:-${TORUPATH}} diff --git a/src/toru/toru-utils b/src/toru/toru-utils index 96aa35e..2fecfc2 100755 --- a/src/toru/toru-utils +++ b/src/toru/toru-utils @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012 Joshua Ismael Haase Hernández (xihh) +# +# License: Unspecified + . libremessages . $(librelib conf.sh) load_files libretools diff --git a/src/toru/toru-where b/src/toru/toru-where index 4b3ff1b..9d90972 100755 --- a/src/toru/toru-where +++ b/src/toru/toru-where @@ -1,5 +1,10 @@ #!/usr/bin/env bash # Locates a PKGBUILD dir on toru's path cache + +# Copyright (C) 2012 Nicolás Reynolds +# +# License: Unspecified + . $(librelib conf.sh) load_files libretools check_vars libretools TORUPATH || exit 1 diff --git a/src/treepkg b/src/treepkg index 4dc29dc..a23edbf 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,8 @@ #!/usr/bin/env bash -#set -x -# Copyright (C) 2012 Nicolás Reynolds + +# Copyright (C) 2012 Nicolás Reynolds +# +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3-54-g00ecf 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 --- AUTHORS | 12 +++++++++--- src/abslibre-tools/createworkdir | 3 ++- src/abslibre-tools/diff-unfree | 3 ++- src/abslibre-tools/libreaddiff | 1 + src/abslibre-tools/librerelease | 4 +++- src/abslibre-tools/librestage | 3 ++- src/aur | 6 +++--- src/chroot-tools/chcleanup | 3 ++- src/chroot-tools/hooks-chcleanup.sh | 17 +++++++++++++++++ src/chroot-tools/hooks-check.sh | 17 +++++++++++++++++ src/chroot-tools/librechroot | 5 +++-- src/chroot-tools/libremakepkg | 5 +++-- src/fullpkg/fullpkg-build | 1 + src/fullpkg/fullpkg-find | 2 +- src/is_built | 2 +- src/lib/libremessages | 1 + src/mips64el-tools/add-mips64el | 4 ++++ src/mips64el-tools/mips-add | 4 ++++ src/mips64el-tools/mipsrelease | 2 +- src/pkgbuild-check-nonfree | 6 +++--- src/toru/toru-path | 1 + src/treepkg | 3 ++- 22 files changed, 83 insertions(+), 22 deletions(-) (limited to 'src/lib') diff --git a/AUTHORS b/AUTHORS index 747e012..335eb9c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,9 @@ -Joshua Haase -Nicolás Reynolds -Luke Shumaker +Daniel Molina (lluvia) +Joseph Graham (Xylon) +Joshua Ismael Haase Hernández (xihh) +Luke Shumaker +Michał Masłowski +Nicolás Reynolds + +As well as authors of code taken from Arch Linux's "devtools" and +Pacman's "makepkg". diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 51863e3..8e5ebcd 100755 --- a/src/abslibre-tools/createworkdir +++ b/src/abslibre-tools/createworkdir @@ -2,7 +2,8 @@ # CreateWorkDir # Creates a dir structure for working with Parabola packages -# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2013 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree index e8c18e6..fc32e77 100755 --- a/src/abslibre-tools/diff-unfree +++ b/src/abslibre-tools/diff-unfree @@ -2,7 +2,8 @@ # This script will help you diff a *-libre PKGBUILD against the unfree one # to check for updates. -# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) # # License: GNU GPLv3+ # diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff index 641f552..16a77b5 100755 --- a/src/abslibre-tools/libreaddiff +++ b/src/abslibre-tools/libreaddiff @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2011-2012 Michał Masłowski +# Copyright (C) 2012 Daniel Molina (lluvia) # # License: GNU GPLv3+ # 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: diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 6ae0af0..1e208c9 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -2,7 +2,8 @@ # LibreStage # Prepares packages for upload -# Copyright (C) 2010-2011 Nicolás Reynolds +# Copyright (C) 2010-2012 Nicolás Reynolds +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2013-2014 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/aur b/src/aur index 72857ed..4057b6e 100755 --- a/src/aur +++ b/src/aur @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Copyright (C) 2010 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2010-2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010-2012 Nicolás Reynolds +# Copyright (C) 2012-2014 Luke Shumaker # # License: GNU GPLv3+ # diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index e766117..60a4e22 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,5 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) Nicolás Reynolds +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012-2013 Luke Shumaker # # License: GNU GPLv3 # diff --git a/src/chroot-tools/hooks-chcleanup.sh b/src/chroot-tools/hooks-chcleanup.sh index 86c872c..0fd0f72 100644 --- a/src/chroot-tools/hooks-chcleanup.sh +++ b/src/chroot-tools/hooks-chcleanup.sh @@ -1,4 +1,21 @@ #!/usr/bin/env bash +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv2+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + set -euE hook_pre_build+=("clean_chroot") diff --git a/src/chroot-tools/hooks-check.sh b/src/chroot-tools/hooks-check.sh index 2702f95..850516b 100644 --- a/src/chroot-tools/hooks-check.sh +++ b/src/chroot-tools/hooks-check.sh @@ -1,4 +1,21 @@ #!/usr/bin/env bash +# Copyright (C) 2013 Luke Shumaker +# +# License: GNU GPLv2+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + set -euE hook_check_pkgbuild+=("check_pkgbuild_nonfree") diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index ca29cbb..bb82bd2 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -2,8 +2,9 @@ set -euE # librechroot -# Copyright (C) 2010 Nicolás Reynolds -# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010-2012 Nicolás Reynolds +# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012 Michał Masłowski # Copyright (C) 2012-2014 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 6050174..1ed4eaf 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -2,8 +2,9 @@ set -euE # libremakepkg -# Copyright (C) 2010-2011 Nicolás Reynolds -# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010-2012 Nicolás Reynolds +# Copyright (C) 2010-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012 Michał Masłowski # Copyright (C) 2012-2014 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build index 0ffd42a..715f505 100755 --- a/src/fullpkg/fullpkg-build +++ b/src/fullpkg/fullpkg-build @@ -4,6 +4,7 @@ # aren't built or need update and then makepkg them in order. # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2011 Nicolás Reynolds # Copyright (C) 2013 Luke Shumaker # # License: Unspecified diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index 009bb86..c12888a 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -4,7 +4,7 @@ # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Michał Masłowski -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (C) 2007 Armin Luntzer diff --git a/src/is_built b/src/is_built index 21b17d3..67c0d8d 100755 --- a/src/is_built +++ b/src/is_built @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2012-2013 Luke Shumaker +# Copyright (C) 2013 Luke Shumaker # # License: GNU GPLv3+ # diff --git a/src/lib/libremessages b/src/lib/libremessages index 71f1636..cb3d883 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -3,6 +3,7 @@ # When run directly, it does `set -euE` # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2012 Nicolás Reynolds # Copyright (C) 2012-2014 Luke Shumaker # For just the setup_traps() function: diff --git a/src/mips64el-tools/add-mips64el b/src/mips64el-tools/add-mips64el index 17b167b..bf04663 100755 --- a/src/mips64el-tools/add-mips64el +++ b/src/mips64el-tools/add-mips64el @@ -1,6 +1,10 @@ #!/usr/bin/env bash # Change all arch array that aren't any or mips64el already +# Copyright (C) 2011 Nicolás Reynolds +# +# License: Unspecified + find -name 'PKGBUILD' -exec sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" '{}' \; exit $? diff --git a/src/mips64el-tools/mips-add b/src/mips64el-tools/mips-add index 402036e..11f6a74 100755 --- a/src/mips64el-tools/mips-add +++ b/src/mips64el-tools/mips-add @@ -1,4 +1,8 @@ #!/usr/bin/env bash +# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# +# License: Unspecified + . libremessages if ! grep mips64el PKGBUILD >/dev/null; then # Add mips64el in ${arch} array if it isn't 'any' warning "Adding mips64el arch" diff --git a/src/mips64el-tools/mipsrelease b/src/mips64el-tools/mipsrelease index f8b77a8..fec2a1b 100755 --- a/src/mips64el-tools/mipsrelease +++ b/src/mips64el-tools/mipsrelease @@ -2,8 +2,8 @@ # Local release of mips64el packages + clean ABS sync # Called by HOOKLOCALRELEASE -# Copyright (C) 2011 Nicolás Reynolds # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2013 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree index aa56d71..11eaf42 100755 --- a/src/pkgbuild-check-nonfree +++ b/src/pkgbuild-check-nonfree @@ -2,9 +2,9 @@ # -*- tab-width: 4 ; sh-basic-offset: 4 -*- # pkgbuild-check-nonfree -# Copyright (C) 2010 Joseph Graham (Xylon) -# Copyright (C) 2010 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2010 Nicolás Reynolds +# Copyright (C) 2011 Joseph Graham (Xylon) +# Copyright (C) 2010-2011 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2010-2012 Nicolás Reynolds # Copyright (C) 2012-2013 Luke Shumaker # # License: GNU GPLv3+ diff --git a/src/toru/toru-path b/src/toru/toru-path index 407059b..8674d53 100755 --- a/src/toru/toru-path +++ b/src/toru/toru-path @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012 Michał Masłowski # # License: Unspecified diff --git a/src/treepkg b/src/treepkg index a23edbf..9d3c0c3 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,7 @@ #!/usr/bin/env bash -# Copyright (C) 2012 Nicolás Reynolds +# Copyright (C) 2012-2013 Nicolás Reynolds +# Copyright (C) 2013 Luke Shumaker # # License: GNU GPLv3+ # -- cgit v1.2.3-54-g00ecf From cb2a663ff60eacf14f38fa4a67aabe35600c0ecb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Mar 2014 22:13:04 -0400 Subject: Relicense some files from GPLv3+ GPLv2+ (that I'm the sole copyright holder of) --- src/chroot-tools/hooks-distcc.sh | 4 ++-- src/lib/conf.sh | 4 ++-- src/lib/libreblacklist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/chroot-tools/hooks-distcc.sh b/src/chroot-tools/hooks-distcc.sh index 445810b..37c82dc 100644 --- a/src/chroot-tools/hooks-distcc.sh +++ b/src/chroot-tools/hooks-distcc.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # Copyright (C) 2013 Luke Shumaker # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This file is part of Parabola. # # Parabola is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # Parabola is distributed in the hope that it will be useful, diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 3e07c11..2730b57 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -3,11 +3,11 @@ # Copyright (C) 2012-2014 Luke Shumaker # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index fdd27f9..8aa33cc 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -4,11 +4,11 @@ # Copyright (C) 2013-2014 Luke Shumaker # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, -- cgit v1.2.3-54-g00ecf From 222856031fbbf314e8e47db414225756a9c6fba2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 23 Mar 2014 18:09:13 -0400 Subject: Most of my desired re-licensings were authorized on the dev list --- src/chroot-tools/chcleanup | 5 +++-- src/chroot-tools/librechroot | 4 ++-- src/chroot-tools/libremakepkg | 4 ++-- src/fullpkg/fullpkg | 15 ++++++++++++++- src/fullpkg/fullpkg-build | 15 ++++++++++++++- src/lib/libremessages | 7 ++----- src/mips64el-tools/add-mips64el | 15 ++++++++++++++- src/mips64el-tools/mips-add | 15 ++++++++++++++- src/repo-diff | 15 ++++++++++++++- src/toru/toru | 5 +++-- src/toru/toru-info | 15 ++++++++++++++- src/toru/toru-path | 15 ++++++++++++++- src/toru/toru-utils | 15 ++++++++++++++- src/toru/toru-where | 15 ++++++++++++++- 14 files changed, 138 insertions(+), 22 deletions(-) (limited to 'src/lib') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 60a4e22..a72f951 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -2,11 +2,12 @@ # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012-2013 Luke Shumaker # -# License: GNU GPLv3 +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 3 of the License. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index bb82bd2..d8e76ac 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -7,13 +7,13 @@ set -euE # Copyright (C) 2012 Michał Masłowski # Copyright (C) 2012-2014 Luke Shumaker # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This file is part of Parabola. # # Parabola is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # Parabola is distributed in the hope that it will be useful, diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 1ed4eaf..aad4217 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -7,13 +7,13 @@ set -euE # Copyright (C) 2012 Michał Masłowski # Copyright (C) 2012-2014 Luke Shumaker # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This file is part of Parabola. # # Parabola is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # Parabola is distributed in the hope that it will be useful, diff --git a/src/fullpkg/fullpkg b/src/fullpkg/fullpkg index 0572ddb..8e87e46 100755 --- a/src/fullpkg/fullpkg +++ b/src/fullpkg/fullpkg @@ -5,7 +5,20 @@ # Copyright (C) 2011 Nicolás Reynolds # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . usage() { print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}" diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build index 715f505..06d0d50 100755 --- a/src/fullpkg/fullpkg-build +++ b/src/fullpkg/fullpkg-build @@ -7,7 +7,20 @@ # Copyright (C) 2011 Nicolás Reynolds # Copyright (C) 2013 Luke Shumaker # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # TODO move __build to chroot diff --git a/src/lib/libremessages b/src/lib/libremessages index cb3d883..b89e2bc 100755 --- a/src/lib/libremessages +++ b/src/lib/libremessages @@ -15,11 +15,11 @@ # Copyright (C) 2006 Andras Voroskoi # Copyright (C) 2006 Miklos Vajna # -# License: GNU GPLv3+ +# License: GNU GPLv2+ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -30,9 +30,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# setup_traps() is based on pacman:makepkg, which is GPLv2+, -# so we take the '+' to combine it with our GPLv3+. - ################################################################################ # Inherit most functions from devtools # ################################################################################ diff --git a/src/mips64el-tools/add-mips64el b/src/mips64el-tools/add-mips64el index bf04663..bb1bb69 100755 --- a/src/mips64el-tools/add-mips64el +++ b/src/mips64el-tools/add-mips64el @@ -3,7 +3,20 @@ # Copyright (C) 2011 Nicolás Reynolds # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . find -name 'PKGBUILD' -exec sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" '{}' \; diff --git a/src/mips64el-tools/mips-add b/src/mips64el-tools/mips-add index 11f6a74..ef708ec 100755 --- a/src/mips64el-tools/mips-add +++ b/src/mips64el-tools/mips-add @@ -1,7 +1,20 @@ #!/usr/bin/env bash # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . . libremessages if ! grep mips64el PKGBUILD >/dev/null; then # Add mips64el in ${arch} array if it isn't 'any' diff --git a/src/repo-diff b/src/repo-diff index d25983a..e36edad 100755 --- a/src/repo-diff +++ b/src/repo-diff @@ -3,7 +3,20 @@ # Copyright (C) 2013 Nicolás Reynolds # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . . libremessages diff --git a/src/toru/toru b/src/toru/toru index 16ec4af..142e9e4 100755 --- a/src/toru/toru +++ b/src/toru/toru @@ -6,11 +6,12 @@ # Copyright (C) 2012-2013 Michał Masłowski # Copyright (C) 2013 Luke Shumaker # -# License: GNU GPLv3 +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 3 of the License. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/toru/toru-info b/src/toru/toru-info index aa84fcf..a427050 100755 --- a/src/toru/toru-info +++ b/src/toru/toru-info @@ -3,7 +3,20 @@ # Copyright (C) 2012 Nicolás Reynolds # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . . libremessages . $(librelib conf) diff --git a/src/toru/toru-path b/src/toru/toru-path index 8674d53..32ddc24 100755 --- a/src/toru/toru-path +++ b/src/toru/toru-path @@ -3,7 +3,20 @@ # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Michał Masłowski # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . source toru-utils diff --git a/src/toru/toru-utils b/src/toru/toru-utils index 2fecfc2..164f418 100755 --- a/src/toru/toru-utils +++ b/src/toru/toru-utils @@ -3,7 +3,20 @@ # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Joshua Ismael Haase Hernández (xihh) # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . . libremessages . $(librelib conf.sh) diff --git a/src/toru/toru-where b/src/toru/toru-where index 9d90972..e70d135 100755 --- a/src/toru/toru-where +++ b/src/toru/toru-where @@ -3,7 +3,20 @@ # Copyright (C) 2012 Nicolás Reynolds # -# License: Unspecified +# License: GNU GPLv3+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . . $(librelib conf.sh) load_files libretools -- cgit v1.2.3-54-g00ecf From 9f1ef0bbdf1bc246c0c035a2dd6a4bcfa41664ef Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 11 May 2014 23:31:58 -0400 Subject: update the libremessages man page with changes from devtools --- src/lib/libremessages.1.ronn | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn index d39dad0..2bf73a1 100644 --- a/src/lib/libremessages.1.ronn +++ b/src/lib/libremessages.1.ronn @@ -156,15 +156,16 @@ these, you could end up deleting a lot of someone's work. * `cleanup` []: *If* `setup_workdir` has been run, `rm -rf "$WORKDIR"`. If given - a numeric argument, it will then call `exit`(1) with that argument. + a numeric argument, it will then call `exit`(1) with that + argument, otherwise it calls `exit`(1) with a status of 0. * `abort`: Calls `msg` with the message "Aborting...", then calls - `cleanup 0`. + `cleanup 255`. * `die` [...]: Exactly like `error`, but calls `cleanup` and calls `exit`(1) - with a status of 1. + with a status of 255. ### LOCKFILE ROUTINES @@ -212,9 +213,6 @@ pull it into a separate program. xterm and rxvt (and their various values; "rxvt-unicode-256color" is still rxvt). -Also, I think `abort` calling `cleanup 1` would make more sense than -`cleanup 0`. - ## SEE ALSO librelib(7), gettext(1), common.sh(3) -- cgit v1.2.3-54-g00ecf