From: Ondřej Surý Date: Mon, 19 Feb 2018 11:03:28 +0000 (+0100) Subject: Update scripts in util/ to drop the year information from the individual source files. X-Git-Tag: v9.13.0~147^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8efcca40878e805c8516fe2183904b80ae06fd5;p=thirdparty%2Fbind9.git Update scripts in util/ to drop the year information from the individual source files. --- diff --git a/util/COPYRIGHT b/util/COPYRIGHT index 36fd94a48ae..e0a6aa6a665 100644 --- a/util/COPYRIGHT +++ b/util/COPYRIGHT @@ -1,5 +1,8 @@ -Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC") +Copyright (C) Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. + +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. diff --git a/util/COPYRIGHT.BRIEF b/util/COPYRIGHT.BRIEF index 36fd94a48ae..7e8e0f41c82 100644 --- a/util/COPYRIGHT.BRIEF +++ b/util/COPYRIGHT.BRIEF @@ -3,3 +3,6 @@ Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. + +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. diff --git a/util/COPYRIGHT.BSDI b/util/COPYRIGHT.BSDI index c7f0bb3e31b..d12bfdc0a21 100644 --- a/util/COPYRIGHT.BSDI +++ b/util/COPYRIGHT.BSDI @@ -4,6 +4,9 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. + This code is derived from software contributed to ISC by Berkeley Software Design, Inc. diff --git a/util/COPYRIGHT.NAI b/util/COPYRIGHT.NAI index 6511e2a39a5..9fa858d88b9 100644 --- a/util/COPYRIGHT.NAI +++ b/util/COPYRIGHT.NAI @@ -4,7 +4,10 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Portions Copyright (C) 1995-2000 by Network Associates, Inc. +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. + +Portions Copyright (C) Network Associates, Inc. Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/util/COPYRIGHT.NOM b/util/COPYRIGHT.NOM index b520f41e428..4ce20cbcd6c 100644 --- a/util/COPYRIGHT.NOM +++ b/util/COPYRIGHT.NOM @@ -4,7 +4,10 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Portions Copyright (C) @NOMYEARS@ Nominum, Inc. +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. + +Portions Copyright (C) Nominum, Inc. Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/util/COPYRIGHT.PORTION b/util/COPYRIGHT.PORTION index c30dabb7053..5a8c40a3610 100644 --- a/util/COPYRIGHT.PORTION +++ b/util/COPYRIGHT.PORTION @@ -3,3 +3,6 @@ Portions Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. + +See the COPYRIGHT file distributed with this work for additional +information regarding copyright ownership. diff --git a/util/copyrights b/util/copyrights index b9b17b52347..849cf10fd4f 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3,7 +3,7 @@ ./.gitlab-ci.yml X 2018 ./Atffile X 2011 ./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 -./COPYRIGHT TXT 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 +./COPYRIGHT X 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./HISTORY X 2010,2013,2016,2017 ./HISTORY.md MKD 2017 ./Kyuafile X 2017 diff --git a/util/file_year.sh b/util/file_year.sh deleted file mode 100644 index a2bffe28368..00000000000 --- a/util/file_year.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012, 2016 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# $Id$ - -# Given a file in the currently checked-out branch of the Git -# repository, find out in what year it was most recently committed. -# Used by merge_copyrights. - -rev=`git rev-list HEAD -- "$1" | head -n 1` -git show --pretty=format:%ai $rev | head -n 1 | sed 's;-.*;;' diff --git a/util/merge_copyrights b/util/merge_copyrights index 55b9f97c3bb..5dd8596a2aa 100644 --- a/util/merge_copyrights +++ b/util/merge_copyrights @@ -10,7 +10,6 @@ use strict; my %file_types = (); my %file_years = (); -my %exists = (); open(COPYRIGHTS, ") { @@ -25,20 +24,10 @@ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time()); $sec = $min = $hour = $mday = $mon = $wday = $yday = $isdst = 0; $year += 1900; -open(FILES, "git ls-files | sed 's;^;./;' |") || die "git ls-files: $!"; -while () { - chomp; - $exists{$_} = 1; -} -close(FILES); - -open(CHANGES, "sh util/recent_changes.sh |") || die "recent_changes.sh: $!"; +open(CHANGES, "git ls-files | sed 's;^;./;' | sort |") || die "git ls-files: $!"; while () { chomp; - # this file isn't in the repository now - next unless ($exists{$_}); - next if (m%/\.\# | # CVS old conflict file /CVS/ | # CVS directory /.git/ | # git directory @@ -133,13 +122,9 @@ while () { } else { $file_types{$_} = "?"; } - my $m_year = int(`sh util/file_year.sh $_`); if (($file_types{$_} eq "MAN" || $file_types{$_} eq "HTML") && $base =~ /\.docbook$/ && -e $base) { $file_years{$_} = "DOCBOOK"; - } elsif ($m_year != $year) { - print "$_: must set copyright year(s) manually\n"; - $file_years{$_} = "????"; } else { $file_years{$_} = "$year"; } diff --git a/util/recent_changes.sh b/util/recent_changes.sh deleted file mode 100644 index 4279db78783..00000000000 --- a/util/recent_changes.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Find the list of files that have been touched in the Git repository -# during the current calendar year. This is done by walking backwards -# through the output of "git whatchanged" until a year other than the -# current one is seen. Used by merge_copyrights. - -thisyear=`date +%Y` -when="`expr $thisyear - 1`-12-31" -git whatchanged --since="$when" --pretty="" | awk ' - BEGIN { change=0 } - NF == 0 { next; } - $(NF-1) ~ /[AM]/ { print "./" $NF; change=1 } - END { if (change) print "./COPYRIGHT" } ' | sort | uniq