diff options
Diffstat (limited to 'keyserver')
-rw-r--r-- | keyserver/Makefile.am | 6 | ||||
-rw-r--r-- | keyserver/curl-shim.c | 6 | ||||
-rw-r--r-- | keyserver/curl-shim.h | 6 | ||||
-rwxr-xr-x | keyserver/gpg2keys_mailto.in | 6 | ||||
-rwxr-xr-x | keyserver/gpg2keys_test.in | 6 | ||||
-rw-r--r-- | keyserver/gpgkeys_curl.c | 6 | ||||
-rw-r--r-- | keyserver/gpgkeys_finger.c | 6 | ||||
-rw-r--r-- | keyserver/gpgkeys_hkp.c | 6 | ||||
-rw-r--r-- | keyserver/gpgkeys_ldap.c | 6 | ||||
-rw-r--r-- | keyserver/ksutil.c | 6 | ||||
-rw-r--r-- | keyserver/ksutil.h | 6 |
11 files changed, 22 insertions, 44 deletions
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index 23f2befc6..103e82f42 100644 --- a/keyserver/Makefile.am +++ b/keyserver/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 # Note that we have renamed the resulting binaries to from gpgkeys_foo diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c index 7d35320db..085ed99c4 100644 --- a/keyserver/curl-shim.c +++ b/keyserver/curl-shim.c @@ -7,7 +7,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, @@ -16,9 +16,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/keyserver/curl-shim.h b/keyserver/curl-shim.h index 9cec84065..0a70b4cc8 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.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 _CURL_SHIM_H_ diff --git a/keyserver/gpg2keys_mailto.in b/keyserver/gpg2keys_mailto.in index 4d5f62711..4e5d6bc30 100755 --- a/keyserver/gpg2keys_mailto.in +++ b/keyserver/gpg2keys_mailto.in @@ -7,7 +7,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, @@ -16,9 +16,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/>. use Getopt::Std; $Getopt::Std::STANDARD_HELP_VERSION=1; $sendmail="@SENDMAIL@ -t"; diff --git a/keyserver/gpg2keys_test.in b/keyserver/gpg2keys_test.in index c335c65a2..9f2c0b6f7 100755 --- a/keyserver/gpg2keys_test.in +++ b/keyserver/gpg2keys_test.in @@ -7,7 +7,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, @@ -16,9 +16,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/>. use Getopt::Std; $Getopt::Std::STANDARD_HELP_VERSION=1; diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index e326df63c..f14b4c9a7 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.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/>. * * In addition, as a special exception, the Free Software Foundation * gives permission to link the code of the keyserver helper tools: diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c index 58082790f..9933991b1 100644 --- a/keyserver/gpgkeys_finger.c +++ b/keyserver/gpgkeys_finger.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/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index cb86b26c0..4729cc067 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.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/>. * * In addition, as a special exception, the Free Software Foundation * gives permission to link the code of the keyserver helper tools: diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 93b24844a..df107ff9c 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.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/>. * * In addition, as a special exception, the Free Software Foundation * gives permission to link the code of the keyserver helper tools: diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 18158fc81..04e21b6a8 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.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/>. * * In addition, as a special exception, the Free Software Foundation * gives permission to link the code of the keyserver helper tools: diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h index 154054407..3068592e8 100644 --- a/keyserver/ksutil.h +++ b/keyserver/ksutil.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/>. * * In addition, as a special exception, the Free Software Foundation * gives permission to link the code of the keyserver helper tools: |