diff options
Diffstat (limited to 'util')
40 files changed, 115 insertions, 175 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 189ab6de3..2d5e40006 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,12 @@ +2007-10-23 Werner Koch <[email protected]> + + Switched entire package to GPLv3+. The parts taken from libassuan + and glibc are kept at LGPLv2+; only the address as been chnaged. + + * argparse.c (strusage): Use id 10 for the license string; + defaults to GPL3+. Change long note to version 3 or later. + (show_version): Print the license info. + 2007-08-24 Werner Koch <[email protected]> * fileutil.c (same_file_p): New. Taken from SVN trunk. diff --git a/util/Makefile.am b/util/Makefile.am index 1da5a1075..60d287ac2 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -4,7 +4,7 @@ # # GnuPG 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. # # GnuPG is distributed in the hope that it will be useful, @@ -13,9 +13,7 @@ # GNU General Public License for more details. # # 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 - +# along with this program; if not, see <http://www.gnu.org/licenses/>. ## Process this file with automake to produce Makefile.in INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl diff --git a/util/argparse.c b/util/argparse.c index cd29c0cef..601f6660e 100644 --- a/util/argparse.c +++ b/util/argparse.c @@ -1,25 +1,21 @@ /* [argparse.c wk 17.06.97] Argument Parser for option handling - * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, + * 2007 Free Software Foundation, Inc. * - * This file is part of GnuPG. + * This file is part of GnuPG. * - * GnuPG 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 - * (at your option) any later version. + * GnuPG 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. * - * GnuPG 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. + * GnuPG 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - * - * - * Note: This is an independent version of the one in WkLib + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> @@ -857,6 +853,9 @@ show_version() /* copyright string */ if( (s=strusage(14)) ) printf("%s\n", s ); + /* Licence string. */ + if( (s=strusage (10)) ) + printf("%s\n", s ); /* copying conditions */ if( (s=strusage(15)) ) fputs(s, stdout); @@ -893,6 +892,7 @@ usage( int level ) * 0: Copyright String auf stderr ausgeben * 1: Kurzusage auf stderr ausgeben und beenden * 2: Langusage auf stdout ausgeben und beenden + * 10: Return license info string * 11: name of program * 12: optional name of package which includes this program. * 13: version string @@ -912,25 +912,27 @@ default_strusage( int level ) { const char *p = NULL; switch( level ) { + case 10: p = ("License GPLv3+: GNU GPL version 3 or later " + "<http://gnu.org/licenses/gpl.html>"); + break; case 11: p = "foo"; break; case 13: p = "0.0"; break; case 14: p = "Copyright (C) 2007 Free Software Foundation, Inc."; break; case 15: p = -"This program comes with ABSOLUTELY NO WARRANTY.\n" -"This is free software, and you are welcome to redistribute it\n" -"under certain conditions. See the file COPYING for details.\n"; break; +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n"; + break; case 16: p = "This is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" +"the Free Software Foundation; either version 3 of the License, or\n" "(at your option) any later version.\n\n" "It is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" "GNU General Public License for more details.\n\n" "You should have received a copy of the GNU General Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"; +"along with this software. If not, see <http://www.gnu.org/licenses/>.\n"; break; case 40: /* short and long usage */ case 41: p = ""; break; diff --git a/util/assuan-buffer.c b/util/assuan-buffer.c index 3c0108601..d8f5d100e 100644 --- a/util/assuan-buffer.c +++ b/util/assuan-buffer.c @@ -13,10 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-client.c b/util/assuan-client.c index 0467f6dc5..edaa2c71e 100644 --- a/util/assuan-client.c +++ b/util/assuan-client.c @@ -14,10 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-connect.c b/util/assuan-connect.c index 9952b4406..eff2b4909 100644 --- a/util/assuan-connect.c +++ b/util/assuan-connect.c @@ -13,10 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-defs.h b/util/assuan-defs.h index 67c4e13ce..775bdf048 100644 --- a/util/assuan-defs.h +++ b/util/assuan-defs.h @@ -14,10 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-errors.c b/util/assuan-errors.c index c3a8770cb..dad5e0ff7 100644 --- a/util/assuan-errors.c +++ b/util/assuan-errors.c @@ -14,10 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-logging.c b/util/assuan-logging.c index f2d6c876d..692e98206 100644 --- a/util/assuan-logging.c +++ b/util/assuan-logging.c @@ -13,10 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-socket-connect.c b/util/assuan-socket-connect.c index 0c580cd5f..886400e29 100644 --- a/util/assuan-socket-connect.c +++ b/util/assuan-socket-connect.c @@ -13,10 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-socket.c b/util/assuan-socket.c index 4d79792ce..8eb3febcb 100644 --- a/util/assuan-socket.c +++ b/util/assuan-socket.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/assuan-util.c b/util/assuan-util.c index db3cb7232..72558210e 100644 --- a/util/assuan-util.c +++ b/util/assuan-util.c @@ -14,10 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Please note that this is a stripped down and modified version of diff --git a/util/cert.c b/util/cert.c index 317c14b37..8bc924468 100644 --- a/util/cert.c +++ b/util/cert.c @@ -5,7 +5,7 @@ * * GNUPG 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. * * GNUPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/dotlock.c b/util/dotlock.c index 9edac57ed..8369af730 100644 --- a/util/dotlock.c +++ b/util/dotlock.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/errors.c b/util/errors.c index 75498f80e..37e0795d4 100644 --- a/util/errors.c +++ b/util/errors.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/fileutil.c b/util/fileutil.c index dc2722105..202b324d4 100644 --- a/util/fileutil.c +++ b/util/fileutil.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/http.c b/util/http.c index 95010526c..042e2fb49 100644 --- a/util/http.c +++ b/util/http.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/iobuf.c b/util/iobuf.c index f6e817c42..a52f00897 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/isascii.c b/util/isascii.c index b71febe99..be14a3843 100644 --- a/util/isascii.c +++ b/util/isascii.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H diff --git a/util/logger.c b/util/logger.c index 857436c43..5e603d678 100644 --- a/util/logger.c +++ b/util/logger.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/membuf.c b/util/membuf.c index 44347fa1b..db3f5ac37 100644 --- a/util/membuf.c +++ b/util/membuf.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/memory.c b/util/memory.c index e16c3d8f7..55ac49e35 100644 --- a/util/memory.c +++ b/util/memory.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * * We use our own memory allocation functions instead of plain malloc(), diff --git a/util/memrchr.c b/util/memrchr.c index 5621f7323..f4e704f47 100644 --- a/util/memrchr.c +++ b/util/memrchr.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* diff --git a/util/miscutil.c b/util/miscutil.c index 01241bc23..30129634c 100644 --- a/util/miscutil.c +++ b/util/miscutil.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/mkdtemp.c b/util/mkdtemp.c index c0ee0bbdb..e2d3af8c2 100644 --- a/util/mkdtemp.c +++ b/util/mkdtemp.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* This is a replacement function for mkdtemp in case the platform diff --git a/util/pka.c b/util/pka.c index 2a39a4feb..901bfb6c4 100644 --- a/util/pka.c +++ b/util/pka.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/regcomp.c b/util/regcomp.c index 766339945..6964df93e 100644 --- a/util/regcomp.c +++ b/util/regcomp.c @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02110-1301 USA. */ + You should have received a copy of the GNU Lesser General Public License + along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. +*/ #include <assert.h> #include <ctype.h> diff --git a/util/regex.c b/util/regex.c index 34d412002..723733f3e 100644 --- a/util/regex.c +++ b/util/regex.c @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02110-1301 USA. */ + You should have received a copy of the GNU Lesser General Public License + along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. +*/ #ifdef _LIBC /* We have to keep the namespace clean. */ diff --git a/util/regex_internal.c b/util/regex_internal.c index 0f8b897b1..6f3a96e7d 100644 --- a/util/regex_internal.c +++ b/util/regex_internal.c @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02110-1301 USA. */ + You should have received a copy of the GNU Lesser General Public License + along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. +*/ #include <assert.h> #include <ctype.h> diff --git a/util/regex_internal.h b/util/regex_internal.h index 679bea11b..1fbd0d608 100644 --- a/util/regex_internal.h +++ b/util/regex_internal.h @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02110-1301 USA. */ + You should have received a copy of the GNU Lesser General Public License + along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. +*/ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 diff --git a/util/regexec.c b/util/regexec.c index 40d305899..bcdd51563 100644 --- a/util/regexec.c +++ b/util/regexec.c @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02110-1301 USA. */ + You should have received a copy of the GNU Lesser General Public License + along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. +*/ #include <assert.h> #include <ctype.h> diff --git a/util/riscos.c b/util/riscos.c index b94ff5318..814ec695e 100644 --- a/util/riscos.c +++ b/util/riscos.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __RISCOS__C__ diff --git a/util/secmem.c b/util/secmem.c index 5a4affd42..f54c3a5b4 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/simple-gettext.c b/util/simple-gettext.c index f1f504a71..9225737a7 100644 --- a/util/simple-gettext.c +++ b/util/simple-gettext.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* This is a simplified version of gettext written by Ulrich Drepper. diff --git a/util/srv.c b/util/srv.c index 1cbc52eb6..6b6e2116f 100644 --- a/util/srv.c +++ b/util/srv.c @@ -5,7 +5,7 @@ * * GNUPG 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. * * GNUPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/srv.h b/util/srv.h index a81ebd573..fdd568a5f 100644 --- a/util/srv.h +++ b/util/srv.h @@ -5,7 +5,7 @@ * * GNUPG 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. * * GNUPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _SRV_H_ diff --git a/util/strgutil.c b/util/strgutil.c index 9d2b15994..f19bab590 100644 --- a/util/strgutil.c +++ b/util/strgutil.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/timegm.c b/util/timegm.c index 3b7931e7c..430bb7f58 100644 --- a/util/timegm.c +++ b/util/timegm.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* diff --git a/util/ttyio.c b/util/ttyio.c index f763e6605..b60a9196a 100644 --- a/util/ttyio.c +++ b/util/ttyio.c @@ -6,7 +6,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/util/w32reg.c b/util/w32reg.c index f65c9542c..c8c9703b3 100644 --- a/util/w32reg.c +++ b/util/w32reg.c @@ -5,7 +5,7 @@ * * GnuPG 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. * * GnuPG is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> |