diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | cmd.h | 4 | ||||
| -rw-r--r-- | debug.c | 4 | ||||
| -rw-r--r-- | missing_d/ChangeLog | 6 | ||||
| -rw-r--r-- | missing_d/setenv.c | 22 |
5 files changed, 33 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2016-09-07 Arnold D. Robbins <arnold@skeeve.com> + + * cmd.h, debug.c: Update license text to version citing + GPLv3+ and with correct FSF address. Thanks to + David Kaspar <dkaspar@redhat.com> for pointing out the need. + 2016-08-25 Arnold D. Robbins <arnold@skeeve.com> * 4.1.4: Release tar ball made. @@ -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 @@ -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 53b7a812..19d57042 100644 --- a/missing_d/ChangeLog +++ b/missing_d/ChangeLog @@ -1,3 +1,9 @@ +2016-09-07 Arnold D. Robbins <arnold@skeeve.com> + + * setenv.c: Update license text in setenv.c. Thanks + to David Kaspar <dkaspar@redhat.com> for pointing out + the necessity. + 2016-08-25 Arnold D. Robbins <arnold@skeeve.com> * 4.1.4: Release tar ball made. diff --git a/missing_d/setenv.c b/missing_d/setenv.c index 2d1bf10c..46885d52 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> |