diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0396e175db..d2417d6aa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -513,18 +513,6 @@ misc: - checklibs.out when: on_failure -changes: - <<: *precheck_job - except: - - pipelines - script: - - sh util/tabify-changes < CHANGES > CHANGES.tmp - - diff -urNap CHANGES CHANGES.tmp - - perl util/check-changes CHANGES - - sh util/check-line-length.sh CHANGES - - rm CHANGES.tmp - needs: [] - black: <<: *precheck_job needs: [] diff --git a/util/check-changes b/util/check-changes deleted file mode 100644 index ac52645486..0000000000 --- a/util/check-changes +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl -# -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' - if $running_under_some_shell; - # this emulates #! processing on NIH machines. - # (remove #! line above if indigestible) - -$master = 1; - -eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift; - # process any FOO=bar switches - -$, = ' '; # set output field separator -$\ = "\n"; # set output record separator - -$change = 0; -$status = 0; -$wasblank = 1; - -line: while (<>) { - ($Fld1,$Fld2,$Fld3,$Fld4) = split(' ', $_, 9999); - $change = 0 if (!$master && /^\s+--- .* ---$/); - if ($Fld1 =~ /^[1-9][0-9]*\.$/ && $Fld2 =~ /^\[.*\]$/) { - if ($change != 0 && $Fld1 >= $change) { - print 'bad change number', $Fld1; - $status = 1; - } - if ($master && $change != 0 && $Fld1 + 1 != $change) { - print 'bad change number', $Fld1; - $status = 1; - } - $change = $Fld1; - if (!$wasblank) { - print 'missing blank line before change', $Fld1; - $status = 1; - } - } - if (/^\s+--- .* ---$/) { - if (!$wasblank) { - print 'missing blank line before release marker for', $Fld2; - $status = 1; - } - } - if ($Fld1 eq "") { - $wasblank = 1; - } else { - $wasblank = 0; - } -} - -exit $status; diff --git a/util/check-line-length.sh b/util/check-line-length.sh deleted file mode 100644 index 956b147c6e..0000000000 --- a/util/check-line-length.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -expand "$1" \ - | awk -v file="$1" 'length > 80 { - if (logged == 0) { - print file ": Line Too Long" - logged = 1 - } - print -} -END { - if (logged == 1) { - exit(1) - } -}' diff --git a/util/check-pullups.pl b/util/check-pullups.pl deleted file mode 100644 index 2c8d881ef6..0000000000 --- a/util/check-pullups.pl +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -# Given two CHANGES files, list [bug] entries present in the -# first one but not in the second one. -# - -use FileHandle; - -# $/ = ""; - -# Read the CHANGES file $fn and return a hash of change -# texts and categories indexed by change number. - -sub readfile { - my ($fn) = @_; - my $fh = new FileHandle($fn, "r") - or die "open: $fn: $!"; - - my $changes = { }; - - my ($changeid, $category); - - $changeid = "none"; - $category = "none"; - - while (<$fh>) { - if (m/^\s*(\d+)\.\s+\[(\w+)\]/) { - $changeid = $1; - $category = $2; - # print "*** $1 $2\n"; - } elsif (m/---.* released ---/) { - $changeid = "none"; - $category = "none"; - next; - } elsif (m/^# /) { - $changeid = "none"; - $category = "none"; - next; - } - if ($changeid eq "none") { - next; - } - $changes->{$changeid}->{text} .= $_; - $changes->{$changeid}->{category} = $category; - } - - return $changes; -} - -@ARGV == 2 || @ARGV == 3 or die "usage: $0 changes-file-1 changes-file-2\n"; - -my $c1 = readfile($ARGV[0]); -my $c2 = readfile($ARGV[1]); -if (@ARGV == 3) { - $c3 = readfile($ARGV[2]); -} else { - my $c3 = { }; -} - -my $msg = ""; -foreach my $c (sort {$a <=> $b} keys %$c1) { - my $category = $c1->{$c}->{category}; - my $text = $c1->{$c}->{text}; - if ($category ne "func" && $category ne "placeholder" && - !exists($c2->{$c}) && !exists($c3->{$c})) { - if ($msg ne "MISSING\n") { - $msg = "MISSING\n"; - print $msg; - } - print $c1->{$c}->{text}; - } - if (exists($c2->{$c}) && $category ne "placeholder" && - $c2->{$c}->{text} ne $text && !exists($c3->{$c})) { - if ($msg ne "TEXT\n") { - $msg = "TEXT\n"; - print $msg; - } - print $c2->{$c}->{text}; - print $c1->{$c}->{text}; - } -} diff --git a/util/new-func b/util/new-func deleted file mode 100644 index e2b2865abd..0000000000 --- a/util/new-func +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/perl -# -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. -# -# Given two CHANGES files, list [bug] entries present in the -# first one but not in the second one. -# - -use FileHandle; - -# $/ = ""; - -# Read the CHANGES file $fn and return a hash of change -# texts and categories indexed by change number. - -sub readfile { - my ($fn) = @_; - my $fh = new FileHandle($fn, "r") - or die "open: $fn: $!"; - - my $changes = { }; - - my ($changeid, $category); - - $changeid = "none"; - $category = "none"; - - while (<$fh>) { - if (m/^\s*(\d+)\.\s+\[(\w+)\]/) { - $changeid = $1; - $category = $2; - # print "*** $1 $2\n"; - } elsif (m/---.* released ---/) { - $changeid = "none"; - $category = "none"; - next; - } elsif (m/^# /) { - $changeid = "none"; - $category = "none"; - next; - } - if ($changeid eq "none") { - next; - } - $changeid =~ s/\.$//; - $changes->{$changeid}->{text} .= $_; - $changes->{$changeid}->{category} = $category; - } - - return $changes; -} - -@ARGV == 2 || @ARGV == 3 or die "usage: $0 changes-file-1 changes-file-2\n"; - -my $c1 = readfile($ARGV[0]); -my $c2 = readfile($ARGV[1]); -if (@ARGV == 3) { - $c3 = readfile($ARGV[2]); -} else { - my $c3 = { }; -} - -foreach my $c (sort {$a <=> $b} keys %$c1) { - my $category = $c1->{$c}->{category}; - my $text = $c1->{$c}->{text}; - if ($category eq "func" && !exists($c2->{$c}) && !exists($c3->{$c})) { - print $c1->{$c}->{text}; - } -} diff --git a/util/tabify-changes b/util/tabify-changes deleted file mode 100644 index 92607e8a0c..0000000000 --- a/util/tabify-changes +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -expand ${1} \ - | sed \ - -e 's/^\([1-9][0-9][0-9][0-9][0-9][0-9]\.\) */\1 /' \ - -e 's/^\([1-9][0-9][0-9][0-9][0-9]\.\) */\1 /' \ - -e 's/^\([1-9][0-9][0-9][0-9]\.\) */\1 /' \ - -e 's/^\( [1-9][0-9][0-9]\.\) */\1 /' \ - -e 's/^\( [1-9][0-9]\.\) */\1 /' \ - -e 's/^\( [1-9]\.\) */\1 /' \ - -e 's/\( \[.\]\) */\1 /' \ - -e 's/\( \[..\]\) */\1 /' \ - -e 's/\( \[...\]\) */\1 /' \ - -e 's/\( \[....\]\) */\1 /' \ - -e 's/\( \[.....\]\) */\1 /' \ - -e 's/\( \[......\]\) */\1 /' \ - -e 's/\( \[.......\]\) */\1 /' \ - -e 's/\( \[........\]\) */\1 /' \ - -e 's/\( \[.........\]\) */\1 /' \ - -e 's/\( \[..........\]\) */\1 /' \ - -e 's/\( \[...........\]\) */\1 /' \ - -e 's/\( \[............\]\) */\1 /' \ - -e 's/[ ]*$//' \ - | unexpand