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/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 ++++++++--- 9 files changed, 113 insertions(+), 32 deletions(-) create mode 100644 src/chroot-tools/arch-nspawn.patch (limited to 'src/chroot-tools') 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" -- cgit v1.2.3-54-g00ecf