Commit 07b510c4 authored by Eric Dorland's avatar Eric Dorland

New upstream version 1.4

parents 058c990a 9fcc113f
Package: npth
Download: ftp://ftp.gnupg.org/gcrypt/npth/
Download: https://gnupg.org/ftp/gcrypt/npth/
Repository: git://git.gnupg.org/npth.git
Maintainer: Werner Koch <wk@gnupg.org>
Bug reports: gnupg-devel@gnupg.org
Security related bug reports: security@gnupg.org
License (software): LGPLv3+/GPLv2+
License: LGPLv2+
nPth is free software. See the file COPYING.LIB for copying
conditions. License copyright years may be listed using range
notation, e.g., 2000-2013, indicating that every year in the range,
inclusive, is a copyrightable year that would otherwise be listed
individually.
* Authors
......@@ -15,31 +23,20 @@ License (software): LGPLv3+/GPLv2+
* Copyright
nPth is Copyright (C) 2011, 2012, 2014, 2015 g10 Code GmbH
nPth is free software; you can redistribute it and/or modify it
under the terms of either
- the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at
your option) any later version.
or
- 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.
nPth is Copyright (C) 2011, 2012, 2014, 2015, 2017 g10 Code GmbH
or both in parallel, as here.
nPth is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
nPth 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.
nPth 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 Lesser General Public License for more details.
You should have received a copies of the GNU General Public License
and the GNU Lesser General Public License along with this program;
if not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public
License along with this program; if not, see <https://www.gnu.org/licenses/>.
......
This diff is collapsed.
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
This diff is collapsed.
This diff is collapsed.
# HACKING -*- org -*-
#+TITLE: Hacking notes for NPTH
#+TITLE: Hacking notes for nPth
#+STARTUP: showall
* No ChangeLog files
......
# Makefile.am - Top level Makefile for npth.
# Copyright (C) 2011 g10 Code GmbH
#
# This file is part of NPTH.
# This file is part of nPth.
#
# NPTH is free software; you can redistribute it and/or modify it
# nPth is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
#
# NPTH is distributed in the hope that it will be useful, but WITHOUT
# nPth 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 Lesser General
# Public License for more details.
......
......@@ -17,14 +17,14 @@
# Makefile.am - Top level Makefile for npth.
# Copyright (C) 2011 g10 Code GmbH
#
# This file is part of NPTH.
# This file is part of nPth.
#
# NPTH is free software; you can redistribute it and/or modify it
# nPth is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
#
# NPTH is distributed in the hope that it will be useful, but WITHOUT
# nPth 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 Lesser General
# Public License for more details.
......@@ -101,11 +101,10 @@ subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(srcdir)/npth-config.in COPYING \
COPYING.LESSER build-aux/compile build-aux/config.guess \
build-aux/config.sub build-aux/depcomp build-aux/install-sh \
build-aux/missing build-aux/ltmain.sh \
$(top_srcdir)/build-aux/compile \
$(srcdir)/config.h.in $(srcdir)/npth-config.in COPYING.LIB \
build-aux/compile build-aux/config.guess build-aux/config.sub \
build-aux/depcomp build-aux/install-sh build-aux/missing \
build-aux/ltmain.sh $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.sub \
$(top_srcdir)/build-aux/install-sh \
......
Noteworthy changes in version 1.4 (2017-05-16) [C1/A1/R0]
----------------------------------------------
* On macOS make use of an unnamed semaphore.
* Build fixes for FreeBSD, NetBSD, and DragonFlyBSD.
* New function npth_is_protected to help debugging.
* Change license from LGPLv3+/GPLv2+ to LGPLv2+.
Noteworthy changes in version 1.3 (2016-11-22)
----------------------------------------------
......
......@@ -15,9 +15,7 @@
* License
nPth is currently released under a mixed LGPLv3+/GPLv2+ license.
This is to allow its use with GPLv2(only) software. If there is a
need for other licensing terms, please contact us.
nPth is released under the LGPLv2+ license.
* Porting hints
......
......@@ -18,6 +18,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Defined if we have libdispatch */
#undef HAVE_LIB_DISPATCH
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
......@@ -178,9 +181,6 @@
# define _REENTRANT 1
#endif
/* Activate POSIX interface on MacOS X */
#undef _XOPEN_SOURCE
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for npth 1.3.
# Generated by GNU Autoconf 2.69 for npth 1.4.
#
# Report bugs to <gnupg-devel@gnupg.org>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='npth'
PACKAGE_TARNAME='npth'
PACKAGE_VERSION='1.3'
PACKAGE_STRING='npth 1.3'
PACKAGE_VERSION='1.4'
PACKAGE_STRING='npth 1.4'
PACKAGE_BUGREPORT='gnupg-devel@gnupg.org'
PACKAGE_URL=''
......@@ -1349,7 +1349,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures npth 1.3 to adapt to many kinds of systems.
\`configure' configures npth 1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1419,7 +1419,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of npth 1.3:";;
short | recursive ) echo "Configuration of npth 1.4:";;
esac
cat <<\_ACEOF
......@@ -1531,7 +1531,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
npth configure 1.3
npth configure 1.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by npth $as_me 1.3, which was
It was created by npth $as_me 1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2310,9 +2310,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# (Interfaces added: AGE++)
# (Interfaces removed/changed: AGE=0)
#
LIBNPTH_LT_CURRENT=0
LIBNPTH_LT_AGE=0
LIBNPTH_LT_REVISION=6
LIBNPTH_LT_CURRENT=1
LIBNPTH_LT_AGE=1
LIBNPTH_LT_REVISION=0
# If the API is changed in an incompatible way: increment the next counter.
NPTH_CONFIG_API_VERSION=1
......@@ -2840,7 +2840,7 @@ fi
# Define the identity of the package.
PACKAGE='npth'
VERSION='1.3'
VERSION='1.4'
cat >>confdefs.h <<_ACEOF
......@@ -12942,18 +12942,132 @@ CFLAGS=$lt_save_CFLAGS
have_ld_version_script=no
case "${host}" in
*-*-linux*)
have_ld_version_script=yes
have_ld_version_script=yes
;;
*-*-gnu*)
have_ld_version_script=yes
have_ld_version_script=yes
;;
*-apple-darwin*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dispatch_semaphore_create" >&5
$as_echo_n "checking for library containing dispatch_semaphore_create... " >&6; }
if ${ac_cv_search_dispatch_semaphore_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char dispatch_semaphore_create ();
int
main ()
{
return dispatch_semaphore_create ();
;
return 0;
}
_ACEOF
for ac_lib in '' dispatch; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dispatch_semaphore_create=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_dispatch_semaphore_create+:} false; then :
break
fi
done
if ${ac_cv_search_dispatch_semaphore_create+:} false; then :
else
ac_cv_search_dispatch_semaphore_create=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dispatch_semaphore_create" >&5
$as_echo "$ac_cv_search_dispatch_semaphore_create" >&6; }
ac_res=$ac_cv_search_dispatch_semaphore_create
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIB_DISPATCH 1" >>confdefs.h
$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
fi
;;
*-*-aix*)
have_fork_unsafe_semaphore=yes
have_fork_unsafe_semaphore=yes
;;
*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*)
LIBS="-lpthread $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
$as_echo_n "checking for library containing sem_init... " >&6; }
if ${ac_cv_search_sem_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char sem_init ();
int
main ()
{
return sem_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' rt; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_sem_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_sem_init+:} false; then :
break
fi
done
if ${ac_cv_search_sem_init+:} false; then :
else
ac_cv_search_sem_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_init" >&5
$as_echo "$ac_cv_search_sem_init" >&6; }
ac_res=$ac_cv_search_sem_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
;;
esac
......@@ -12972,7 +13086,7 @@ $as_echo "#define HAVE_FORK_UNSAFE_SEMAPHORE 1" >>confdefs.h
fi
# Set some default values
config_libs="-lnpth"
config_libs="-lnpth $LIBS"
have_w32_system=no
have_w32ce_system=no
have_w64_system=no
......@@ -12984,7 +13098,7 @@ case "${host}" in
;;
*-mingw32ce*)
have_w32ce_system=yes
;;
;;
esac
case "${host}" in
*-mingw32ce*|*-mingw32*)
......@@ -13028,7 +13142,7 @@ fi
if test "$have_w32_system" = yes; then
BUILD_ISODATE=`date --iso-8601`
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
BUILD_FILEVERSION="${BUILD_FILEVERSION}53688"
BUILD_FILEVERSION="${BUILD_FILEVERSION}40908"
fi
......@@ -14219,7 +14333,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by npth $as_me 1.3, which was
This file was extended by npth $as_me 1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -14285,7 +14399,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
npth config.status 1.3
npth config.status 1.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -16279,6 +16393,6 @@ fi
echo "
$PACKAGE_NAME-$PACKAGE_VERSION prepared for make
Revision: d1b8d54 (53688)
Revision: 9fcc113 (40908)
Platform: $host
"
# configure.ac -*- Autoconf -*-
# Copyright (C) 2011, 2012 g10 Code GmbH
# This file is part of NPTH.
#
# NPTH is free software; you can redistribute it and/or modify it
# under the terms of either
# This file is part of nPth.
#
# - the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3 of the License, or (at
# your option) any later version.
# nPth is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
#
# or
#
# - 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.
#
# or both in parallel, as here.
#
# NPTH is distributed in the hope that it will be useful, but WITHOUT
# nPth 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 Lesser General
# Public License for more details.
......@@ -35,7 +26,7 @@ min_automake_version="1.14"
# the version number immediately after the release and do another
# commit and push so that the git magic is able to work.
# See below for the LT versions.
m4_define(my_version, [1.3])
m4_define(my_version, [1.4])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
......@@ -59,9 +50,9 @@ AC_INIT([npth],[my_full_version],[gnupg-devel@gnupg.org])
# (Interfaces added: AGE++)
# (Interfaces removed/changed: AGE=0)
#
LIBNPTH_LT_CURRENT=0
LIBNPTH_LT_AGE=0
LIBNPTH_LT_REVISION=6
LIBNPTH_LT_CURRENT=1
LIBNPTH_LT_AGE=1
LIBNPTH_LT_REVISION=0
# If the API is changed in an incompatible way: increment the next counter.
NPTH_CONFIG_API_VERSION=1
......@@ -117,16 +108,21 @@ LT_LANG([Windows Resource])
have_ld_version_script=no
case "${host}" in
*-*-linux*)
have_ld_version_script=yes
have_ld_version_script=yes
;;
*-*-gnu*)
have_ld_version_script=yes
have_ld_version_script=yes
;;
*-apple-darwin*)
AC_DEFINE(_XOPEN_SOURCE, 500, Activate POSIX interface on MacOS X)
AC_SEARCH_LIBS([dispatch_semaphore_create],[dispatch],
[AC_DEFINE([HAVE_LIB_DISPATCH],1,[Defined if we have libdispatch])])
;;
*-*-aix*)
have_fork_unsafe_semaphore=yes
have_fork_unsafe_semaphore=yes
;;
*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*)
LIBS="-lpthread $LIBS"
AC_SEARCH_LIBS([sem_init],[rt])
;;
esac
......@@ -136,7 +132,7 @@ if test "$have_fork_unsafe_semaphore" = yes; then
fi
# Set some default values
config_libs="-lnpth"
config_libs="-lnpth $LIBS"
have_w32_system=no
have_w32ce_system=no
have_w64_system=no
......@@ -148,7 +144,7 @@ case "${host}" in
;;
*-mingw32ce*)
have_w32ce_system=yes
;;
;;
esac
case "${host}" in
*-mingw32ce*|*-mingw32*)
......
# This is a template. The dist target uses it to create the real file.
Summary: NPTH - the new GNU Portable Threads Library
Name: npth
Version: 1.3
Version: 1.4
Release: 1
URL: http://www.gnupg.org/
Source: ftp://ftp.gnupg.org/gcrypt/alpha
Group: Development/Libraries
Copyright: LGPLv3+/GPLv2+
Copyright: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildRequires: make
Prereq: /sbin/ldconfig /sbin/install-info
......
......@@ -6,7 +6,7 @@ Release: 1
URL: http://www.gnupg.org/
Source: ftp://ftp.gnupg.org/gcrypt/alpha
Group: Development/Libraries
Copyright: LGPLv3+/GPLv2+
Copyright: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildRequires: make
Prereq: /sbin/ldconfig /sbin/install-info
......
# Makefile.am - src/ Makefile for npth.
# Copyright (C) 2011 g10 Code GmbH
#
# This file is part of NPTH.
# This file is part of nPth.
#
# NPTH is free software; you can redistribute it and/or modify it
# under the terms of either
# nPth is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
#
# - the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
# or
#
# - 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.
#
# or both in parallel, as here.
#
# NPTH is distributed in the hope that it will be useful, but WITHOUT
# nPth 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 Lesser General
# Public License for more details.
......
......@@ -17,24 +17,14 @@
# Makefile.am - src/ Makefile for npth.
# Copyright (C) 2011 g10 Code GmbH
#
# This file is part of NPTH.
# This file is part of nPth.
#
# NPTH is free software; you can redistribute it and/or modify it
# under the terms of either
# nPth is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
#
# - the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
# or
#
# - 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.