copyright dates in binutils (and includes/)

copyright dates in binutils (and includes/)

[Alan Modra]

I've been hacking gcc's contrib/update-copyright.py for binutils,
and have run it over binutils to update all the binutils copyright
notices.

Here's an example of the update:

--- a/bfd/elf32-sparc.c
+++ b/bfd/elf32-sparc.c
@@ -1,7 +1,5 @@
 /* SPARC-specific support for 32-bit ELF
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1993-2014 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
Does anyone have a violent objection to committing updates in
bfd, binutils, elfcpp, gas, gold, gprof, ld, and opcodes?

How about includes/ too?  The choices there are
a) apply to just binutils owned files, 
b) apply to binutils+gdb files,
c) apply to the lot, and update gcc/include/ too.

I see Joel already updated include/gdb, but the script makes a further
small change.  So choice (b) in include/gdb consists of patches like
the following:

diff --git a/include/gdb/gdb-index.h b/include/gdb/gdb-index.h
index d846b04..a8d4f2f 100644
--- a/include/gdb/gdb-index.h
+++ b/include/gdb/gdb-index.h
@@ -1,5 +1,5 @@
 /* Public attributes of the .gdb_index section.
-   Copyright 2012-2014 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
-- 
Alan Modra
Australia Development Lab, IBM

Re: copyright dates in binutils (and includes/)

[Joel Brobecker]

Hi Alan,

My two cents...

> --- a/bfd/elf32-sparc.c
> +++ b/bfd/elf32-sparc.c
> @@ -1,7 +1,5 @@
>  /* SPARC-specific support for 32-bit ELF
> -   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
> -   2003, 2004, 2005, 2006, 2007, 2010, 2011
> -   Free Software Foundation, Inc.
> +   Copyright (C) 1993-2014 Free Software Foundation, Inc.
>  
>     This file is part of BFD, the Binary File Descriptor library.
>  
> Does anyone have a violent objection to committing updates in
> bfd, binutils, elfcpp, gas, gold, gprof, ld, and opcodes?

FWIW, I find that the new ouptut is a nice improvement.

I should mention, however, that for us to use ranges like this,
the FSF asked us to add a note explaining that the copyright years
could be abbreviated into a range. See gdb/README (at the end).
I suspect that you'll need the same note for binutils.

> How about includes/ too?  The choices there are
> a) apply to just binutils owned files, 
> b) apply to binutils+gdb files,
> c) apply to the lot, and update gcc/include/ too.
> 
> I see Joel already updated include/gdb, but the script makes a further
> small change.  So choice (b) in include/gdb consists of patches like
> the following:

IIRC, the FSF does not require the (C), but I think they would
prefer it. Either way, it doesn't get in the way for future updates,
so I'd go with at least (b).

As for (c), I'll let the GCC folks answer.

-- 
Joel

Re: copyright dates in binutils (and includes/)

[Joseph S. Myers]

On Thu, 27 Feb 2014, Joel Brobecker wrote:

> I should mention, however, that for us to use ranges like this,
> the FSF asked us to add a note explaining that the copyright years
> could be abbreviated into a range. See gdb/README (at the end).
> I suspect that you'll need the same note for binutils.

And, where a gap in the years is being implicitly filled in by conversion 
to a range, make sure that either (a) there was a public version control 
repository for binutils during that year, or (b) there was a release 
(including beta releases, Cygnus releases etc., not just official 
releases) during that year.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: copyright dates in binutils (and includes/)

[Alan Modra]

On Thu, Feb 27, 2014 at 06:47:17PM +0000, Joseph S. Myers wrote:
> On Thu, 27 Feb 2014, Joel Brobecker wrote:
> 
> > I should mention, however, that for us to use ranges like this,
> > the FSF asked us to add a note explaining that the copyright years
> > could be abbreviated into a range. See gdb/README (at the end).
> > I suspect that you'll need the same note for binutils.

Thanks Joel.  I'll copy that or the gcc wording.

> And, where a gap in the years is being implicitly filled in by conversion 
> to a range, make sure that either (a) there was a public version control 
> repository for binutils during that year, or (b) there was a release 
> (including beta releases, Cygnus releases etc., not just official 
> releases) during that year.

It looks like the earliest binutils files that are edited by
update-copyright.py have copyright dates starting at 1985.  Of those,
quite a few have skipped years.  eg. binutils/filemode.c is
Copyright 1985, 1990,...

So, CVS goes back to 1991, and there are copies of old binutils
releases for all years from 1988 to 2002 except for 1999 at
ftp://sourceware.org/pub/binutils/old-releases/

Joseph, do you know why implicitly adding years to the claimed
copyright years is a problem?  I'm guessing the file needs to be
published somewhere for each year claimed.

-- 
Alan Modra
Australia Development Lab, IBM

Re: copyright dates in binutils (and includes/)

[Joel Brobecker]

> Joseph, do you know why implicitly adding years to the claimed
> copyright years is a problem?  I'm guessing the file needs to be
> published somewhere for each year claimed.

IANAL, but from 2 discussions with copyright-clerk:

  1. We start claiming copyright the year the file as committed
     to a medium (hard drive), not the year it was published.

  2. As long as we have evidence of a copyrightable change each year,
     we can include that year in the list of copyright years in
     all files' headers.

For (2), this is how I asked the FSF:

> My question is: As we have evidence of copyrightable changes to the
> GDB project every year since 1986, is it acceptable fix the copyright
> headers to add the missing holes? And if yes, is it acceptable to go
> straight to the next step, which is reducing the copyright years to
> a single range, even if the original list had holes in it? (we will
> make sure that the first year of the range is always 1986 or later,
> or else investigate to make sure that the range is correct).
>
> For example, we would reduce:
>
> > Copyright (C) 1986, 1988-1989, 1991-1993, 1999-2000, 2007-2012 Free
> > Software Foundation, Inc.
>
> into:
>
> > 1986-2012 Free Software Foundation, Inc.
>
> Naturally, if the initial year was 1995, then it would be the year
> used as the start of the range!

... to which they answered that it would be acceptable.

Does it mean that the sources needed to be made public that year for
us to be able to claim copyright that year? It did not seem so to me.
But you could ask the FSF (copyright DASH clerk AT fsf DOT org).

-- 
Joel

Re: copyright dates in binutils (and includes/)

[Joseph S. Myers]

On Fri, 28 Feb 2014, Joel Brobecker wrote:

> > Joseph, do you know why implicitly adding years to the claimed
> > copyright years is a problem?  I'm guessing the file needs to be
> > published somewhere for each year claimed.
> 
> IANAL, but from 2 discussions with copyright-clerk:
> 
>   1. We start claiming copyright the year the file as committed
>      to a medium (hard drive), not the year it was published.

I don't think it counts unless the version in question got published at 
some point.  The question is about versions that weren't published at the 
time, but were published later when the version control history was 
released.

There was a discussion on bug-standards starting Jan 2012.  Karl's revised 
wording from 11 May 2012 seems to indicate that if a version was committed 
to a version control history that was later released, the dates from that 
history count as copyrightable years (so reducing the number of cases 
where it may not be possible to fill in gaps) - but that revised wording 
doesn't seem to have been committed.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: copyright dates in binutils (and includes/)

[Alan Modra]

[-- Attachment #1: Type: text/plain, Size: 3639 bytes --]

On Fri, Feb 28, 2014 at 06:22:08PM +0000, Joseph S. Myers wrote:
> On Fri, 28 Feb 2014, Joel Brobecker wrote:
> 
> > > Joseph, do you know why implicitly adding years to the claimed
> > > copyright years is a problem?  I'm guessing the file needs to be
> > > published somewhere for each year claimed.
> > 
> > IANAL, but from 2 discussions with copyright-clerk:
> > 
> >   1. We start claiming copyright the year the file as committed
> >      to a medium (hard drive), not the year it was published.
> 
> I don't think it counts unless the version in question got published at 
> some point.  The question is about versions that weren't published at the 
> time, but were published later when the version control history was 
> released.
> 
> There was a discussion on bug-standards starting Jan 2012.  Karl's revised 
> wording from 11 May 2012 seems to indicate that if a version was committed 
> to a version control history that was later released, the dates from that 
> history count as copyrightable years (so reducing the number of cases 
> where it may not be possible to fill in gaps) - but that revised wording 
> doesn't seem to have been committed.

Thanks for pointing me at that discussion Joseph.  I've read through
all of those posts and the current
http://www.gnu.org/prep/maintain/maintain.html

It's clear that we are allowed, and even encouraged, to add the
current year to the copyright notice in each file when activity on the
package *as a whole* makes that year a "copyrightable" year.  ie. It
is not necessary that a given file had changes itself in the current
year, which was the practice we followed in the binutils project
previously.

Extending that reasoning to previous years allows us to fill in
missing years in many files.  The only condition is that each year
added be a "copyrightable" year.  You explained upthread, based on the
bug-standards discussion, exactly what constituted a "copyrightable"
year so I won't repeat it here.  I'm certain that every year since the
inception of the binutils project was in fact a "copyrightable" year,
but the funny thing is that we don't even need to know what makes a
year a "copyrightable" year.  If one file in the project correctly
claims copyright in a given year, then all files extant at that time
in the project can also have that year filled in.  For example,
gas/read.h is "Copyright 1986, 1990, .." and gas/read.c before Nick
changed that file to a year range was "Copyright 1986, 1987, 1990,..".
That allows us to add 1987 to the years in gas/read.h.

opcodes/m88k-dis.c is "Copyright 1986, 1987, 1988, 1989, 1990, 1991,.."
so there we have every year since the start of the binutils project,
until binutils had a public CVS repository.  Multiple other files also
call out each of these years, as can easily be verified with grep.

The only fly in the ointment is a file like binutils/filemode.c, added
to binutils in 1991 carrying a copyright of "1985, 1990, 1991,..".
For that file we have to look at the emacs project where it
originated, and ask whether the missing years are "copyrightable".
I think they are, using the same reasoning as above for the emacs
project.

Attached is the diff I'd like to commit.  Generated by
/usr/bin/python ./update-copyright.py --this-year
chmod a+x bfd/mep-relocs.pl binutils/ranlib.sh binutils/sanity.sh binutils/testsuite/binutils-all/windres/msupdate gas/testsuite/gas/rx/make-d gold/testsuite/*.sh gprof/bbconv.pl ld/genscripts.sh
git checkout -- `for z in include/*; do test -f ../gcc-current/$z && echo $z; done`

I'll post update-copyright.py separately.

-- 
Alan Modra
Australia Development Lab, IBM

[-- Attachment #2: copyright.diff.gz --]
[-- Type: application/octet-stream, Size: 134189 bytes --]

Re: copyright dates in binutils (and includes/)

[Alan Modra]

On Mon, Mar 03, 2014 at 02:14:51PM +1030, Alan Modra wrote:
> I'll post update-copyright.py separately.

--- /src/gcc-current/contrib/update-copyright.py	2013-02-07 12:55:28.272161270 +1030
+++ ./update-copyright.py	2014-03-03 13:44:35.650293322 +1030
@@ -74,6 +74,8 @@
                 'COPYING.LIB',
                 'COPYING3',
                 'COPYING3.LIB',
+                'COPYING.LIBGLOSS',
+                'COPYING.NEWLIB',
                 'LICENSE',
                 'fdl.texi',
                 'gpl_v3.texi',
@@ -110,6 +112,18 @@
                 'texinfo.tex',
                 ])
 
+        self.skip_extensions |= set ([
+                # Maintained by the translation project.
+                '.po',
+
+                # Automatically-generated.
+                '.pot',
+                ])
+
+        self.skip_dirs |= set ([
+                'autom4te.cache',
+                ])
+
 
     def get_line_filter (self, dir, filename):
         if filename.startswith ('ChangeLog'):
@@ -201,7 +215,7 @@
         # A regexp for notices that might have slipped by.  Just matching
         # 'copyright' is too noisy, and 'copyright.*[0-9]' falls foul of
         # HTML header markers, so check for 'copyright' and two digits.
-        self.other_copyright_re = re.compile ('copyright.*[0-9][0-9]',
+        self.other_copyright_re = re.compile ('(^|[^\._])copyright[^=]*[0-9][0-9]',
                                               re.IGNORECASE)
         self.comment_re = re.compile('#+|[*]+|;+|%+|//+|@c |dnl ')
         self.holders = { '@copying': '@copying' }
@@ -530,144 +544,15 @@
                     return True
         return GenericFilter.skip_file (self, dir, filename)
 
-class GCCFilter (GenericFilter):
+class LdFilter (GenericFilter):
     def __init__ (self):
         GenericFilter.__init__ (self)
 
-        self.skip_files |= set ([
-                # Not part of GCC
-                'math-68881.h',
-                ])
-
-        self.skip_dirs |= set ([
-                # Better not create a merge nightmare for the GNAT folks.
-                'ada',
-
-                # Handled separately.
-                'testsuite',
-                ])
-
         self.skip_extensions |= set ([
-                # Maintained by the translation project.
-                '.po',
-
-                # Automatically-generated.
-                '.pot',
-                ])
-
-        self.fossilised_files |= set ([
-                # Old news won't be updated.
-                'ONEWS',
-                ])
-
-class TestsuiteFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_extensions |= set ([
-                # Don't change the tests, which could be woend by anyone.
-                '.c',
-                '.C',
-                '.cc',
-                '.h',
-                '.hs',
-                '.f',
-                '.f90',
-                '.go',
-                '.inc',
-                '.java',
+                # ld testsuite output match files.
+                '.ro',
                 ])
 
-    def skip_file (self, dir, filename):
-        # g++.niklas/README contains historical copyright information
-        # and isn't updated.
-        if filename == 'README' and os.path.basename (dir) == 'g++.niklas':
-            return True
-        return GenericFilter.skip_file (self, dir, filename)
-
-class LibCppFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_extensions |= set ([
-                # Maintained by the translation project.
-                '.po',
-
-                # Automatically-generated.
-                '.pot',
-                ])
-
-class LibGCCFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_dirs |= set ([
-                # Imported from GLIBC.
-                'soft-fp',
-                ])
-
-class LibJavaFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_dirs |= set ([
-                # Handled separately.
-                'testsuite',
-
-                # Not really part of the library
-                'contrib',
-
-                # Imported from upstream
-                'classpath',
-                'libltdl',
-                ])
-
-    def get_line_filter (self, dir, filename):
-        if filename == 'NameDecoder.h':
-            return re.compile ('.*NAME_COPYRIGHT')
-        if filename == 'ICC_Profile.h':
-            return re.compile ('.*icSigCopyrightTag')
-        return GenericFilter.get_line_filter (self, dir, filename)
-
-class LibMudflapFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_dirs |= set ([
-                # Handled separately.
-                'testsuite',
-                ])
-
-class LibStdCxxFilter (GenericFilter):
-    def __init__ (self):
-        GenericFilter.__init__ (self)
-
-        self.skip_files |= set ([
-                # Contains no copyright of its own, but quotes the GPL.
-                'intro.xml',
-                ])
-
-        self.skip_dirs |= set ([
-                # Contains automatically-generated sources.
-                'html',
-
-                # The testsuite data files shouldn't be changed.
-                'data',
-
-                # Contains imported images
-                'images',
-                ])
-
-        self.own_files |= set ([
-                # Contains markup around the copyright owner.
-                'spine.xml',
-                ])
-
-    def get_line_filter (self, dir, filename):
-        if filename == 'boost_concept_check.h':
-            return re.compile ('// \(C\) Copyright Jeremy Siek')
-        return GenericFilter.get_line_filter (self, dir, filename)
-
 class GCCCopyright (Copyright):
     def __init__ (self, errors):
         Copyright.__init__ (self, errors)
@@ -682,84 +567,43 @@
         self.add_package_author ('The Free Software Foundation, Inc.', canon_fsf)
         self.add_package_author ('Software Foundation, Inc.', canon_fsf)
 
-        self.add_external_author ('ARM')
-        self.add_external_author ('AdaCore')
-        self.add_external_author ('Ami Tavory and Vladimir Dreizin, IBM-HRL.')
-        self.add_external_author ('Cavium Networks.')
-        self.add_external_author ('Faraday Technology Corp.')
-        self.add_external_author ('Florida State University')
-        self.add_external_author ('Greg Colvin and Beman Dawes.')
-        self.add_external_author ('Hewlett-Packard Company')
-        self.add_external_author ('Information Technology Industry Council.')
-        self.add_external_author ('James Theiler, Brian Gough')
-        self.add_external_author ('Makoto Matsumoto and Takuji Nishimura,')
-        self.add_external_author ('National Research Council of Canada.')
-        self.add_external_author ('Peter Dimov and Multi Media Ltd.')
-        self.add_external_author ('Peter Dimov')
-        self.add_external_author ('Pipeline Associates, Inc.')
+        self.add_external_author ('Carnegie Mellon University')
+        self.add_external_author ('John D. Polstra.')
+        self.add_external_author ('Linaro Ltd.')
+        self.add_external_author ('MIPS Computer Systems, Inc.')
+        self.add_external_author ('Red Hat Inc.')
         self.add_external_author ('Regents of the University of California.')
-        self.add_external_author ('Silicon Graphics Computer Systems, Inc.')
-        self.add_external_author ('Silicon Graphics')
-        self.add_external_author ('Stephen L. Moshier')
-        self.add_external_author ('Sun Microsystems, Inc. All rights reserved.')
-        self.add_external_author ('The Go Authors.  All rights reserved.')
-        self.add_external_author ('The Go Authors. All rights reserved.')
-        self.add_external_author ('The Go Authors.')
         self.add_external_author ('The Regents of the University of California.')
-        self.add_external_author ('Unicode, Inc.')
-        self.add_external_author ('University of Toronto.')
+        self.add_external_author ('Third Eye Software, Inc.')
+        self.add_external_author ('Ulrich Drepper')
 
 class GCCCmdLine (CmdLine):
     def __init__ (self):
         CmdLine.__init__ (self, GCCCopyright)
 
         self.add_dir ('.', TopLevelFilter())
-        # boehm-gc is imported from upstream.
+        self.add_dir ('bfd')
+        self.add_dir ('binutils')
+        self.add_dir ('cpu')
         self.add_dir ('config', ConfigFilter())
-        # contrib isn't really part of GCC.
-        self.add_dir ('fixincludes')
-        self.add_dir ('gcc', GCCFilter())
-        self.add_dir (os.path.join ('gcc', 'testsuite'), TestsuiteFilter())
-        self.add_dir ('gnattools')
+        self.add_dir ('elfcpp')
+        self.add_dir ('gas')
+        self.add_dir ('gold')
+        self.add_dir ('gprof')
         self.add_dir ('include')
-        self.add_dir ('libada')
-        self.add_dir ('libatomic')
-        self.add_dir ('libbacktrace')
-        self.add_dir ('libcpp', LibCppFilter())
-        self.add_dir ('libdecnumber')
-        # libffi is imported from upstream.
-        self.add_dir ('libgcc', LibGCCFilter())
-        self.add_dir ('libgfortran')
-        self.add_dir ('libgomp')
-        self.add_dir ('libiberty')
-        self.add_dir ('libitm')
-        self.add_dir ('libjava', LibJavaFilter())
-        self.add_dir (os.path.join ('libjava', 'testsuite'), TestsuiteFilter())
-        self.add_dir ('libmudflap', LibMudflapFilter())
-        self.add_dir (os.path.join ('libmudflap', 'testsuite'),
-                      TestsuiteFilter())
-        self.add_dir ('libobjc')
-        self.add_dir ('libquadmath')
-        # libsanitiser is imported from upstream.
-        self.add_dir ('libssp')
-        self.add_dir ('libstdc++-v3', LibStdCxxFilter())
-        self.add_dir ('lto-plugin')
-        # zlib is imported from upstream.
+        self.add_dir ('ld', LdFilter())
+        self.add_dir ('opcodes')
 
         self.default_dirs = [
-            'gcc',
-            'libada',
-            'libatomic',
-            'libbacktrace',
-            'libcpp',
-            'libdecnumber',
-            'libgcc',
-            'libgfortran',
-            'libgomp',
-            'libitm',
-            'libmudflap',
-            'libobjc',
-            'libstdc++-v3',
+            'bfd',
+            'binutils',
+            'elfcpp',
+            'gas',
+            'gold',
+            'gprof',
+            'include',
+            'ld',
+            'opcodes',
             ]
 
 GCCCmdLine().main()


-- 
Alan Modra
Australia Development Lab, IBM

Re: copyright dates in binutils (and includes/)

[Richard Sandiford]

Alan Modra <amodra@gmail.com> writes:
> On Mon, Mar 03, 2014 at 02:14:51PM +1030, Alan Modra wrote:
>> I'll post update-copyright.py separately.

Thanks for doing this, looks good to me FWIW.  I don't know whether
we want to keep a single script for both GCC and binutils+gdb or fork,
but probably separate copies makes sense.

As far as including include/ goes: the only reason that didn't happen
for gcc/ was because I didn't want to sort out which files were GCC-
specific and whether binutils, GCC or GDB was the master for each file.
So if we do your option (b) I think we should do (c) as well.  I suppose
that means syncing GCC's include/ with binutils+gdb and then adding
GCC's include/ to the list of "approved" directories.  I'm happy to try
that if it sounds OK.  (Maybe after the 4.9 release, not sure.)

Thanks,
Richard

Re: copyright dates in binutils (and includes/)

[Alan Modra]

On Mon, Mar 03, 2014 at 01:33:18PM +0000, Richard Sandiford wrote:
> Alan Modra <amodra@gmail.com> writes:
> > On Mon, Mar 03, 2014 at 02:14:51PM +1030, Alan Modra wrote:
> >> I'll post update-copyright.py separately.
> 
> Thanks for doing this, looks good to me FWIW.  I don't know whether
> we want to keep a single script for both GCC and binutils+gdb or fork,
> but probably separate copies makes sense.

I guess we have 8 months to decide what to do with my hacks. :-)  If
you choose to merge my changes that's fine by me too.

> As far as including include/ goes: the only reason that didn't happen
> for gcc/ was because I didn't want to sort out which files were GCC-
> specific and whether binutils, GCC or GDB was the master for each file.
> So if we do your option (b) I think we should do (c) as well.  I suppose
> that means syncing GCC's include/ with binutils+gdb and then adding
> GCC's include/ to the list of "approved" directories.  I'm happy to try
> that if it sounds OK.  (Maybe after the 4.9 release, not sure.)

I'm happy with (c, but for now have committed just the other changes.

-- 
Alan Modra
Australia Development Lab, IBM