From c9f8a69f0f2ec88aec2fcb8b30d33ffc0b17c90a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 22 Sep 2006 14:38:38 +0000 Subject: Improved yat2m. Tweaked gpg.texti to be used for gpg1 and gpg2. --- keyserver/ChangeLog | 2 ++ keyserver/no-libgcrypt.c | 23 +++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'keyserver') diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 7a9851555..83d3be15d 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -7,6 +7,8 @@ to OpenSSL. This is considered a bug fix and forgives all possible violations, pertaining to this issue, possibly occured in the past. + + * no-libgcrypt.c: Changed license to a simple all permissive one. * Makefile.am (gpg2keys_ldap_LDADD): For license reasons do not link against common_libs. diff --git a/keyserver/no-libgcrypt.c b/keyserver/no-libgcrypt.c index a2c174ff9..690a366a4 100644 --- a/keyserver/no-libgcrypt.c +++ b/keyserver/no-libgcrypt.c @@ -1,22 +1,13 @@ /* no-libgcrypt.c - Replacement functions for libgcrypt. * Copyright (C) 2003 Free Software Foundation, Inc. * - * 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 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. + * This file is free software; as a special exception the author gives + * unlimited permission to copy and/or distribute it, with or without + * modifications, as long as this notice is preserved. + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ #include -- cgit v1.2.3