[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-977-gef56676

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.1-stable has been updated
       via  ef56676cbda9242818852c1bfeac85339fecf139 (commit)
      from  50487de5c4139c0125ba1ed511890ebd38426ea7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ef56676cbda9242818852c1bfeac85339fecf139

commit ef56676cbda9242818852c1bfeac85339fecf139
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Sep 7 06:03:04 2016 +0300

    Fix license texts in a few files.

diff --git a/ChangeLog b/ChangeLog
index a517e27..887d15c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-07         Arnold D. Robbins     <address@hidden>
+
+       * cmd.h, debug.c: Update license text to version citing
+       GPLv3+ and with correct FSF address. Thanks to
+       David Kaspar <address@hidden> for pointing out the need.
+
 2016-08-25         Arnold D. Robbins     <address@hidden>
 
        * 4.1.4: Release tar ball made.
diff --git a/cmd.h b/cmd.h
index 6fca6d0..1184415 100644
--- a/cmd.h
+++ b/cmd.h
@@ -10,7 +10,7 @@
  * 
  * GAWK 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -20,7 +20,7 @@
  * 
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA
  */
 
 #ifdef HAVE_LIBREADLINE
diff --git a/debug.c b/debug.c
index b2961db..665775d 100644
--- a/debug.c
+++ b/debug.c
@@ -10,7 +10,7 @@
  * 
  * GAWK 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * GAWK is distributed in the hope that it will be useful,
@@ -20,7 +20,7 @@
  * 
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA
  */
 
 #include "awk.h"
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 53b7a81..19d5704 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-07         Arnold D. Robbins     <address@hidden>
+
+       * setenv.c: Update license text in setenv.c. Thanks
+       to David Kaspar <address@hidden> for pointing out
+       the necessity.
+
 2016-08-25         Arnold D. Robbins     <address@hidden>
 
        * 4.1.4: Release tar ball made.
diff --git a/missing_d/setenv.c b/missing_d/setenv.c
index 2d1bf10..46885d5 100644
--- a/missing_d/setenv.c
+++ b/missing_d/setenv.c
@@ -17,11 +17,7 @@ static const char rcsid[] = "Id: setenv.c,v 1.2 2005/04/27 
04:56:11 sra Exp";
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,6 +34,22 @@ static const char rcsid[] = "Id: setenv.c,v 1.2 2005/04/27 
04:56:11 sra Exp";
  * SUCH DAMAGE.
  */
 
+/*
+ * Per the statement at http://opensource.org/licenses/bsd-license.php,
+ *
+ *     The advertising clause in the license appearing on BSD Unix files was
+ *     officially rescinded by the Director of the Office of Technology
+ *     Licensing of the University of California on July 22 1999. He states
+ *     that clause 3 is "hereby deleted in its entirety."
+ *
+ * I removed the advertising clause in the above copyright.
+ * The above web site points to
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change.
+ *
+ * Arnold Robbins
+ * 7 September 2016
+ */
+
 /* #include "port_before.h" */
 
 #include <stddef.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    6 ++++++
 cmd.h               |    4 ++--
 debug.c             |    4 ++--
 missing_d/ChangeLog |    6 ++++++
 missing_d/setenv.c  |   22 +++++++++++++++++-----
 5 files changed, 33 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk