Bugzilla – Attachment 109844 Details for
Bug 26401
xt/fix-old-fsf-address* are no longer needed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26401: Remove xt/fix-old-fsf-address*
Bug-26401-Remove-xtfix-old-fsf-address.patch (text/plain), 6.11 KB, created by
Martin Renvoize (ashimema)
on 2020-09-10 11:55:32 UTC
(
hide
)
Description:
Bug 26401: Remove xt/fix-old-fsf-address*
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-09-10 11:55:32 UTC
Size:
6.11 KB
patch
obsolete
>From 90c21c9a7a18b3eb3c98ad0d17c97fe5725418f8 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 7 Sep 2020 11:25:38 +0200 >Subject: [PATCH] Bug 26401: Remove xt/fix-old-fsf-address* > >On bug 24545 we fixed all the license statements and added a QA check + a test in our test suite. >We do not longer need this script. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > xt/fix-old-fsf-address | 164 --------------------------------- > xt/fix-old-fsf-address.exclude | 6 -- > 2 files changed, 170 deletions(-) > delete mode 100755 xt/fix-old-fsf-address > delete mode 100644 xt/fix-old-fsf-address.exclude > >diff --git a/xt/fix-old-fsf-address b/xt/fix-old-fsf-address >deleted file mode 100755 >index b0c7c001b6..0000000000 >--- a/xt/fix-old-fsf-address >+++ /dev/null >@@ -1,164 +0,0 @@ >-#!/usr/bin/perl >-# >-# Fix GPLv2 license blurbs that have the old FSF address at Temple Street, >-# instead of the Franklin Street one. Files to be fixed are read from >-# stdin. Typical usage would be: >-# >-# ./xt/find-license-problems . | >-# grep -vFx -f ./xt/fix-old-fsf-address.exclude | >-# ./xt/fix-old-fsf-address >-# >-# Copyright 2010 Catalyst IT Ltd >-# >-# This file is part of Koha. >-# >-# Koha 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. >-# >-# Koha 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 Koha; if not, see <http://www.gnu.org/licenses>. >- >-use Modern::Perl; >- >-use File::Basename; >-use File::Copy; >-use File::Temp qw/ tempfile /; >- >- >-my $temple = << 'eof'; >-You should have received a copy of the GNU General Public License along with >-Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, >-Suite 330, Boston, MA 02111-1307 USA >-eof >- >-my $franklin = << 'eof'; >-You should have received a copy of the GNU General Public License along >-with Koha; if not, write to the Free Software Foundation, Inc., >-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >-eof >- >- >-my $temple2 = << 'eof'; >-You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, >-Suite 330, Boston, MA 02111-1307 USA >-eof >- >-my $franklin2 = << 'eof'; >-You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, >-Fifth Floor, Boston, MA 02110-1301 USA. >-eof >- >- >-my $temple3 = << 'eof'; >-You should have received a copy of the GNU General Public License >-along with this program; if not, write to the Free Software >-Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307 USA >-eof >- >-my $franklin3 = << 'eof'; >-You should have received a copy of the GNU General Public License >-along with this program; if not, write to the Free Software Foundation, Inc., >-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >-eof >- >- >-my $temple4 = << 'eof'; >-You should have received a copy of the GNU General Public License >-along with Zebra; see the file LICENSE.zebra. If not, write to the >-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA >-02111-1307, USA. >-eof >- >-my $franklin4 = << 'eof'; >-You should have received a copy of the GNU General Public License >-along with Zebra; see the file LICENSE.zebra. If not, write to the >-Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, >-MA 02110-1301 USA. >-eof >- >- >-my @patterns = ($temple, $temple2, $temple3, $temple4); >-my @replacements = ($franklin, $franklin2, $franklin3, $franklin4); >- >- >-sub hashcomment { >- my ($str) = @_; >- my @lines = split /\n/, $str; >- my @result; >- foreach my $line (@lines) { >- push @result, "# $line\n"; >- } >- return join "", @result >-} >- >- >-sub dashcomment { >- my ($str) = @_; >- my @lines = split /\n/, $str; >- my @result; >- foreach my $line (@lines) { >- push @result, "-- $line\n"; >- } >- return join "", @result >-} >- >- >-sub readfile { >- my ($filename) = @_; >- open(my $fh, '<', $filename) || die("Can't open $filename for reading"); >- my @lines; >- while (my $line = <$fh>) { >- push @lines, $line; >- } >- close($fh); >- return join '', @lines; >-} >- >- >-sub try_to_fix { >- my ($data, @patterns) = @_; >- return; >-} >- >- >-sub overwrite { >- my ($filename, $data) = @_; >- my ($fh, $tempname) = tempfile(DIR => dirname($filename)); >- print $fh $data; >- close($fh); >- copy($tempname, $filename); >- unlink($tempname); >-} >- >- >-sub fix_temple_street { >- my ($filename) = @_; >- my $data = readfile($filename); >- my @pats = map { ($_, hashcomment($_), dashcomment($_)) } @patterns; >- my @repls = map { ($_, hashcomment($_), dashcomment($_)) } @replacements; >- while (@pats) { >- my $pat = shift @pats; >- my $repl = shift @repls; >- my $index = index($data, $pat); >- next if $index == -1; >- my $length = length($pat); >- my $before = substr($data, 0, $index); >- my $after = substr($data, $index + $length); >- overwrite($filename, "$before$repl$after"); >- return; >- } >- die("Cannot find old address in $filename"); >-} >- >- >-while (my $filename = <>) { >- chomp $filename; >- fix_temple_street($filename); >-} >diff --git a/xt/fix-old-fsf-address.exclude b/xt/fix-old-fsf-address.exclude >deleted file mode 100644 >index 432608ae08..0000000000 >--- a/xt/fix-old-fsf-address.exclude >+++ /dev/null >@@ -1,6 +0,0 @@ >-INSTALL.fedora7 >-misc/cronjobs/check-url.pl >-misc/cronjobs/cloud-kw.pl >-misc/installer_devel_notes/data/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql >-misc/installer_devel_notes/data/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql >-koha-tmpl/ >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26401
:
109689
|
109710
| 109844