diff options
Diffstat (limited to '')
121 files changed, 2645 insertions, 1609 deletions
diff --git a/COPYING.LESSER b/COPYING.LESSER new file mode 100644 index 00000000..cf9b6b99 --- /dev/null +++ b/COPYING.LESSER @@ -0,0 +1,510 @@ + +                  GNU LESSER GENERAL PUBLIC LICENSE +                       Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL.  It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +                            Preamble + +  The licenses for most software are designed to take away your +freedom to share and change it.  By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +  This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it.  You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + +  When we speak of free software, we are referring to freedom of use, +not price.  Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + +  To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights.  These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +  For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you.  You must make sure that they, too, receive or can get the source +code.  If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it.  And you must show them these terms so they know their rights. + +  We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +  To protect each distributor, we want to make it very clear that +there is no warranty for the free library.  Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L +  Finally, software patents pose a constant threat to the existence of +any free program.  We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder.  Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +  Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License.  This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License.  We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +  When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library.  The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom.  The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +  We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License.  It also provides other free software developers Less +of an advantage over competing non-free programs.  These disadvantages +are the reason we use the ordinary General Public License for many +libraries.  However, the Lesser license provides advantages in certain +special circumstances. + +  For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard.  To achieve this, non-free programs must +be allowed to use the library.  A more frequent case is that a free +library does the same job as widely used non-free libraries.  In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +  In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software.  For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +  Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +  The precise terms and conditions for copying, distribution and +modification follow.  Pay close attention to the difference between a +"work based on the library" and a "work that uses the library".  The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L +                  GNU LESSER GENERAL PUBLIC LICENSE +   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +  0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + +  A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +  The "Library", below, refers to any such software library or work +which has been distributed under these terms.  A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language.  (Hereinafter, translation is +included without limitation in the term "modification".) + +  "Source code" for a work means the preferred form of the work for +making modifications to it.  For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + +  Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope.  The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it).  Whether that is true depends on what the Library does +and what the program that uses the Library does. + +  1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + +  You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +  2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +    a) The modified work must itself be a software library. + +    b) You must cause the files modified to carry prominent notices +    stating that you changed the files and the date of any change. + +    c) You must cause the whole of the work to be licensed at no +    charge to all third parties under the terms of this License. + +    d) If a facility in the modified Library refers to a function or a +    table of data to be supplied by an application program that uses +    the facility, other than as an argument passed when the facility +    is invoked, then you must make a good faith effort to ensure that, +    in the event an application does not supply such function or +    table, the facility still operates, and performs whatever part of +    its purpose remains meaningful. + +    (For example, a function in a library to compute square roots has +    a purpose that is entirely well-defined independent of the +    application.  Therefore, Subsection 2d requires that any +    application-supplied function or table used by this function must +    be optional: if the application does not supply it, the square +    root function must still compute square roots.) + +These requirements apply to the modified work as a whole.  If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works.  But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +  3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library.  To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License.  (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.)  Do not make any other change in +these notices. +^L +  Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +  This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +  4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + +  If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +  5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library".  Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + +  However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library".  The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + +  When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library.  The +threshold for this to be true is not precisely defined by law. + +  If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work.  (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +  Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. +^L +  6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + +  You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License.  You must supply a copy of this License.  If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License.  Also, you must do one +of these things: + +    a) Accompany the work with the complete corresponding +    machine-readable source code for the Library including whatever +    changes were used in the work (which must be distributed under +    Sections 1 and 2 above); and, if the work is an executable linked +    with the Library, with the complete machine-readable "work that +    uses the Library", as object code and/or source code, so that the +    user can modify the Library and then relink to produce a modified +    executable containing the modified Library.  (It is understood +    that the user who changes the contents of definitions files in the +    Library will not necessarily be able to recompile the application +    to use the modified definitions.) + +    b) Use a suitable shared library mechanism for linking with the +    Library.  A suitable mechanism is one that (1) uses at run time a +    copy of the library already present on the user's computer system, +    rather than copying library functions into the executable, and (2) +    will operate properly with a modified version of the library, if +    the user installs one, as long as the modified version is +    interface-compatible with the version that the work was made with. + +    c) Accompany the work with a written offer, valid for at least +    three years, to give the same user the materials specified in +    Subsection 6a, above, for a charge no more than the cost of +    performing this distribution. + +    d) If distribution of the work is made by offering access to copy +    from a designated place, offer equivalent access to copy the above +    specified materials from the same place. + +    e) Verify that the user has already received a copy of these +    materials or that you have already sent this user a copy. + +  For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it.  However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +  It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system.  Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. +^L +  7. 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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +    a) Accompany the combined library with a copy of the same work +    based on the Library, uncombined with any other library +    facilities.  This must be distributed under the terms of the +    Sections above. + +    b) Give prominent notice with the combined library of the fact +    that part of it is a work based on the Library, and explaining +    where to find the accompanying uncombined form of the same work. + +  8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License.  Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License.  However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +  9. You are not required to accept this License, since you have not +signed it.  However, nothing else grants you permission to modify or +distribute the Library or its derivative works.  These actions are +prohibited by law if you do not accept this License.  Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +  10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions.  You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. +^L +  11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License.  If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all.  For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices.  Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +  12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded.  In such case, this License incorporates +the limitation as if written in the body of this License. + +  13. The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation.  If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. +^L +  14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission.  For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this.  Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +                            NO WARRANTY + +  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +                     END OF TERMS AND CONDITIONS +^L +           How to Apply These Terms to Your New Libraries + +  If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change.  You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + +  To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + +    <one line to give the library's name and a brief idea of what it does.> +    Copyright (C) <year>  <name of author> + +    This library 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. + +    This library 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 copy of the GNU Lesser General Public +    License along with this library; if not, write to the Free Software +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary.  Here is a sample; alter the names: + +  Yoyodyne, Inc., hereby disclaims all copyright interest in the +  library `Frob' (a library for tweaking knobs) written by James +  Random Hacker. + +  <signature of Ty Coon>, 1 April 1990 +  Ty Coon, President of Vice + +That's all there is to it! + + @@ -1,5 +1,14 @@  2004-12-07  Marcus Brinkmann  <[email protected]> +	* README: Refer to COPYING.LESSER and "each file" instead of +	COPYING. +	* COPYING.LESSER: New file. +	* gpgme.spec.in (%doc): Add COPYING.LESSER. +	* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL +	2.1 or later. +	* TODO: Add copyright notice. +	* README.CVS: Likewise. +  	* configure.ac (GPGSM_VERSION): Fix filter to get it.  2004-10-22  Marcus Brinkmann  <[email protected]> diff --git a/Makefile.am b/Makefile.am index f0e22579..69c1bbd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,20 +1,21 @@ +# Makefile.am - Top level Makefile for GPGME.  # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002 g10 Code GmbH +# Copyright (C) 2001, 2002, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in @@ -28,7 +28,8 @@ Cryptographic Message Syntax (CMS).  GPGME runs best on GNU/Linux or *BSD systems.  Other Unices may  require small portability fixes, send us your patches. -See the file COPYING for copyright and warranty information. +See the file COPYING.LESSER and each file for copyright and warranty +information.  Installation @@ -47,5 +47,13 @@ et al. are properly indicated at the top of configure.ac and take care  to copy the files and not merely use symlinks. +Copyright 2004 g10 Code GmbH +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. @@ -152,3 +152,15 @@ Hey Emacs, this is -*- outline -*- mode!  * Error checking   ** engine-gpgsm, with-validation    Add error checking some time after releasing a new gpgsm. + + +Copyright 2004 g10 Code GmbH + +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. diff --git a/acinclude.m4 b/acinclude.m4 index 19675109..3042240f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3,18 +3,18 @@ dnl Copyright (C) 2004 g10 Code GmbH  dnl  dnl This file is part of GPGME.  dnl -dnl GPGME is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. +dnl GPGME is free software; you can redistribute it and/or modify it +dnl under the terms of the GNU Lesser General Public License as +dnl published by the Free Software Foundation; either version 2.1 of the +dnl License, or (at your option) any later version.  dnl  -dnl GPGME is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -dnl GNU General Public License for more details. +dnl GPGME is distributed in the hope that it will be useful, but WITHOUT +dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +dnl or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General +dnl Public License for more details.  dnl  -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this program; if not, write to the Free Software  dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) diff --git a/assuan/ChangeLog b/assuan/ChangeLog index f740e95e..cc383539 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07  Marcus Brinkmann  <[email protected]> + +	* README.1st: Add copyright notice. +  2004-06-23  Marcus Brinkmann  <[email protected]>  	* assuan-domain-connect.c [HAVE_SYS_UIO_H]: Include <sys/uio.h>. @@ -499,7 +503,7 @@  	* assuan-defs.h: Add space in the context for this. - Copyright 2001, 2002 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.   This file is free software; as a special exception the author gives   unlimited permission to copy and/or distribute it, with or without diff --git a/assuan/README.1st b/assuan/README.1st index 6e8d4ec8..47bdefa2 100644 --- a/assuan/README.1st +++ b/assuan/README.1st @@ -23,3 +23,14 @@ updating this directory, are:  * assuan-pipe-connect.c  ** Do not install SIGPIPE signal handler here. + + + Copyright 2004 g10 Code GmbH + + 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. diff --git a/configure.ac b/configure.ac index 8e4e5d38..3fed5e50 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,21 @@ -# configure.in for GPGME +# configure.ac for GPGME  # Copyright (C) 2000 Werner Koch (dd9jn)  # Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  # (Process this file with autoconf to produce a configure script.) diff --git a/doc/ChangeLog b/doc/ChangeLog index 96628695..4c657292 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,13 @@  2004-12-07  Marcus Brinkmann  <[email protected]> +	* Makefile.am: Change license to LGPL. +	(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. + +	* gpgme.texi: Change license to LGPL (also for documentation of +	GPGME's license). +	* lesser.texi: New file. +	* gpl.texi: File removed. +  	* gpgme.texi (Creating Contexts): Fix cut&paste error.  Reported  	by Noel Torres <[email protected]>. diff --git a/doc/Makefile.am b/doc/Makefile.am index 1f6a4bc4..c5aeb2f4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,20 +1,20 @@  # doc - Automake template -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in @@ -22,4 +22,4 @@  DISTCLEANFILES = gpgme.tmp  info_TEXINFOS = gpgme.texi -gpgme_TEXINFOS = gpl.texi +gpgme_TEXINFOS = lesser.texi diff --git a/doc/gpgme.texi b/doc/gpgme.texi index d97b5662..a63c7843 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -24,18 +24,18 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of  Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH.  The GPGME reference manual 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. +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 GPGME reference manual 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. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  @end ifinfo @@ -56,19 +56,20 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.  @vskip 0pt plus 1filll  Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH. +  The GPGME reference manual 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. +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 GPGME reference manual 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. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  @end titlepage  @page @@ -91,8 +92,8 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of  Appendices -* Copying::                       The GNU General Public License says how you -                                  can copy and share `GnuPG Made Easy'. +* Library Copying::               The GNU Lesser General Public License says +                                  how you can copy and share `GnuPG Made Easy'.  Indices @@ -5050,7 +5051,7 @@ case the state of @var{ctx} is not modified).  @end deftypefun -@include gpl.texi +@include lesser.texi  @node Concept Index diff --git a/doc/gpl.texi b/doc/gpl.texi deleted file mode 100644 index ca0508fa..00000000 --- a/doc/gpl.texi +++ /dev/null @@ -1,397 +0,0 @@ -@node Copying -@appendix GNU GENERAL PUBLIC LICENSE - -@cindex GPL, GNU General Public License -@center Version 2, June 1991 - -@display -Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. -59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - -@appendixsubsec Preamble - -  The licenses for most software are designed to take away your -freedom to share and change it.  By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software---to make sure the software is free for all its users.  This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it.  (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.)  You can apply it to -your programs, too. - -  When we speak of free software, we are referring to freedom, not -price.  Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - -  To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - -  For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have.  You must make sure that they, too, receive or can get the -source code.  And you must show them these terms so they know their -rights. - -  We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - -  Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software.  If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - -  Finally, any free program is threatened constantly by software -patents.  We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary.  To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - -  The precise terms and conditions for copying, distribution and -modification follow. - -@iftex -@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo - -@enumerate -@item -This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License.  The ``Program'', below, -refers to any such program or work, and a ``work based on the Program'' -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language.  (Hereinafter, translation is included without limitation in -the term ``modification''.)  Each licensee is addressed as ``you''. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope.  The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - -@item -You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -@item -You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -@enumerate a -@item -You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. - -@item -You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any -part thereof, to be licensed as a whole at no charge to all third -parties under the terms of this License. - -@item -If the modified program normally reads commands interactively -when run, you must cause it, when started running for such -interactive use in the most ordinary way, to print or display an -announcement including an appropriate copyright notice and a -notice that there is no warranty (or else, saying that you provide -a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this -License.  (Exception: if the Program itself is interactive but -does not normally print such an announcement, your work based on -the Program is not required to print an announcement.) -@end enumerate - -These requirements apply to the modified work as a whole.  If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works.  But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -@item -You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - -@enumerate a -@item -Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, - -@item -Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your -cost of physically performing source distribution, a complete -machine-readable copy of the corresponding source code, to be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -@item -Accompany it with the information you received as to the offer -to distribute corresponding source code.  (This alternative is -allowed only for noncommercial distribution and only if you -received the program in object code or executable form with such -an offer, in accord with Subsection b above.) -@end enumerate - -The source code for a work means the preferred form of the work for -making modifications to it.  For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable.  However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -@item -You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License.  Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - -@item -You are not required to accept this License, since you have not -signed it.  However, nothing else grants you permission to modify or -distribute the Program or its derivative works.  These actions are -prohibited by law if you do not accept this License.  Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -@item -Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions.  You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - -@item -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License.  If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all.  For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices.  Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -@item -If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded.  In such case, this License incorporates -the limitation as if written in the body of this License. - -@item -The Free Software Foundation may publish revised and/or new versions -of the 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 Program -specifies a version number of this License which applies to it and ``any -later version'', you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation.  If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -@item -If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission.  For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this.  Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - -@iftex -@heading NO WARRANTY -@end iftex -@ifinfo -@center NO WARRANTY -@end ifinfo - -@item -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -@item -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. -@end enumerate - -@iftex -@heading END OF TERMS AND CONDITIONS -@end iftex -@ifinfo -@center END OF TERMS AND CONDITIONS -@end ifinfo - -@page -@unnumberedsec How to Apply These Terms to Your New Programs - -  If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - -  To do so, attach the following notices to the program.  It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the ``copyright'' line and a pointer to where the full notice is found. - -@smallexample -@var{one line to give the program's name and an idea of what it does.} -Copyright (C) 19@var{yy}  @var{name of author} - -This program 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. - -This program 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., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -@end smallexample - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - -@smallexample -Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'.  This is free software, and you are welcome -to redistribute it under certain conditions; type `show c'  -for details. -@end smallexample - -The hypothetical commands @samp{show w} and @samp{show c} should show -the appropriate parts of the General Public License.  Of course, the -commands you use may be called something other than @samp{show w} and -@samp{show c}; they could even be mouse-clicks or menu items---whatever -suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a ``copyright disclaimer'' for the program, if -necessary.  Here is a sample; alter the names: - -@smallexample -@group -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written  -by James Hacker. - -@var{signature of Ty Coon}, 1 April 1989 -Ty Coon, President of Vice -@end group -@end smallexample - -This General Public License does not permit incorporating your program into -proprietary programs.  If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library.  If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/doc/lesser.texi b/doc/lesser.texi new file mode 100644 index 00000000..940f70e0 --- /dev/null +++ b/doc/lesser.texi @@ -0,0 +1,565 @@ +@node Library Copying +@appendixsec GNU LESSER GENERAL PUBLIC LICENSE + +@cindex LGPL, Lesser General Public License +@center Version 2.1, February 1999 + +@display +Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc. +59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL.  It also counts +as the successor of the GNU Library Public License, version 2, hence the +version number 2.1.] +@end display + +@appendixsubsec Preamble + +  The licenses for most software are designed to take away your +freedom to share and change it.  By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software---to make sure the software is free for all its users. + +  This license, the Lesser General Public License, applies to some +specially designated software---typically libraries---of the Free +Software Foundation and other authors who decide to use it.  You can use +it too, but we suggest you first think carefully about whether this +license or the ordinary General Public License is the better strategy to +use in any particular case, based on the explanations below. + +  When we speak of free software, we are referring to freedom of use, +not price.  Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of it +in new free programs; and that you are informed that you can do these +things. + +  To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights.  These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +  For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you.  You must make sure that they, too, receive or can get the source +code.  If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it.  And you must show them these terms so they know their rights. + +  We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +  To protect each distributor, we want to make it very clear that +there is no warranty for the free library.  Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + +  Finally, software patents pose a constant threat to the existence of +any free program.  We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder.  Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +  Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License.  This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License.  We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +  When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library.  The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom.  The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +  We call this license the @dfn{Lesser} General Public License because it +does @emph{Less} to protect the user's freedom than the ordinary General +Public License.  It also provides other free software developers Less +of an advantage over competing non-free programs.  These disadvantages +are the reason we use the ordinary General Public License for many +libraries.  However, the Lesser license provides advantages in certain +special circumstances. + +  For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard.  To achieve this, non-free programs must be +allowed to use the library.  A more frequent case is that a free +library does the same job as widely used non-free libraries.  In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +  In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software.  For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +  Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +  The precise terms and conditions for copying, distribution and +modification follow.  Pay close attention to the difference between a +``work based on the library'' and a ``work that uses the library''.  The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +@iftex +@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end iftex +@ifinfo +@center GNU LESSER GENERAL PUBLIC LICENSE +@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end ifinfo + +@enumerate 0 +@item +This License Agreement applies to any software library or other program +which contains a notice placed by the copyright holder or other +authorized party saying it may be distributed under the terms of this +Lesser General Public License (also called ``this License'').  Each +licensee is addressed as ``you''. + +  A ``library'' means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +  The ``Library'', below, refers to any such software library or work +which has been distributed under these terms.  A ``work based on the +Library'' means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language.  (Hereinafter, translation is +included without limitation in the term ``modification''.) + +  ``Source code'' for a work means the preferred form of the work for +making modifications to it.  For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + +  Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope.  The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it).  Whether that is true depends on what the Library does +and what the program that uses the Library does. + +@item +You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + +  You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +@item +You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +@enumerate a +@item +The modified work must itself be a software library. + +@item +You must cause the files modified to carry prominent notices +stating that you changed the files and the date of any change. + +@item +You must cause the whole of the work to be licensed at no +charge to all third parties under the terms of this License. + +@item +If a facility in the modified Library refers to a function or a +table of data to be supplied by an application program that uses +the facility, other than as an argument passed when the facility +is invoked, then you must make a good faith effort to ensure that, +in the event an application does not supply such function or +table, the facility still operates, and performs whatever part of +its purpose remains meaningful. + +(For example, a function in a library to compute square roots has +a purpose that is entirely well-defined independent of the +application.  Therefore, Subsection 2d requires that any +application-supplied function or table used by this function must +be optional: if the application does not supply it, the square +root function must still compute square roots.) +@end enumerate + +These requirements apply to the modified work as a whole.  If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works.  But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +@item +You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library.  To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License.  (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.)  Do not make any other change in +these notices. + +  Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +  This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +@item +You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + +  If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +@item +A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a ``work that uses the Library''.  Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + +  However, linking a ``work that uses the Library'' with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a ``work that uses the +library''.  The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + +  When a ``work that uses the Library'' uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library.  The +threshold for this to be true is not precisely defined by law. + +  If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work.  (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +  Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +@item +As an exception to the Sections above, you may also combine or +link a ``work that uses the Library'' with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + +  You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License.  You must supply a copy of this License.  If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License.  Also, you must do one +of these things: + +@enumerate a +@item +Accompany the work with the complete corresponding +machine-readable source code for the Library including whatever +changes were used in the work (which must be distributed under +Sections 1 and 2 above); and, if the work is an executable linked +with the Library, with the complete machine-readable ``work that +uses the Library'', as object code and/or source code, so that the +user can modify the Library and then relink to produce a modified +executable containing the modified Library.  (It is understood +that the user who changes the contents of definitions files in the +Library will not necessarily be able to recompile the application +to use the modified definitions.) + +@item +Use a suitable shared library mechanism for linking with the Library.  A +suitable mechanism is one that (1) uses at run time a copy of the +library already present on the user's computer system, rather than +copying library functions into the executable, and (2) will operate +properly with a modified version of the library, if the user installs +one, as long as the modified version is interface-compatible with the +version that the work was made with. + +@item +Accompany the work with a written offer, valid for at +least three years, to give the same user the materials +specified in Subsection 6a, above, for a charge no more +than the cost of performing this distribution. + +@item +If distribution of the work is made by offering access to copy +from a designated place, offer equivalent access to copy the above +specified materials from the same place. + +@item +Verify that the user has already received a copy of these +materials or that you have already sent this user a copy. +@end enumerate + +  For an executable, the required form of the ``work that uses the +Library'' must include any data and utility programs needed for +reproducing the executable from it.  However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the +executable. + +  It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system.  Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +@item +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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +@enumerate a +@item +Accompany the combined library with a copy of the same work +based on the Library, uncombined with any other library +facilities.  This must be distributed under the terms of the +Sections above. + +@item +Give prominent notice with the combined library of the fact +that part of it is a work based on the Library, and explaining +where to find the accompanying uncombined form of the same work. +@end enumerate + +@item +You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License.  Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License.  However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +@item +You are not required to accept this License, since you have not +signed it.  However, nothing else grants you permission to modify or +distribute the Library or its derivative works.  These actions are +prohibited by law if you do not accept this License.  Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +@item +Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions.  You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +@item +If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License.  If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all.  For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices.  Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +@item +If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded.  In such case, this License incorporates the limitation as if +written in the body of this License. + +@item +The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +``any later version'', you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation.  If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +@item +If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission.  For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this.  Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +@iftex +@heading NO WARRANTY +@end iftex +@ifinfo +@center NO WARRANTY +@end ifinfo + +@item +BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +@item +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. +@end enumerate + +@iftex +@heading END OF TERMS AND CONDITIONS +@end iftex +@ifinfo +@center END OF TERMS AND CONDITIONS +@end ifinfo + +@page +@appendixsubsec How to Apply These Terms to Your New Libraries + +  If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change.  You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + +  To apply these terms, attach the following notices to the library.  It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +``copyright'' line and a pointer to where the full notice is found. + +@smallexample +@var{one line to give the library's name and an idea of what it does.} +Copyright (C) @var{year}  @var{name of author} + +This library 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. + +This library 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 copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +USA. +@end smallexample + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a ``copyright disclaimer'' for the library, if +necessary.  Here is a sample; alter the names: + +@smallexample +Yoyodyne, Inc., hereby disclaims all copyright interest in the library +`Frob' (a library for tweaking knobs) written by James Random Hacker. + +@var{signature of Ty Coon}, 1 April 1990 +Ty Coon, President of Vice +@end smallexample + +That's all there is to it! diff --git a/gpgme.spec.in b/gpgme.spec.in index 18aa28b8..a5c6996d 100644 --- a/gpgme.spec.in +++ b/gpgme.spec.in @@ -49,7 +49,7 @@ fi  %files  %defattr(-,root,root) -%doc COPYING AUTHORS README INSTALL NEWS ChangeLog TODO THANKS +%doc COPYING COPYING.LESSER AUTHORS README INSTALL NEWS ChangeLog TODO THANKS  %attr(0755,root,root) %{_bindir}/gpgme-config  %attr(0755,root,root) %{_libdir}/*gpgme.so*  %attr(0755,root,root) %{_libdir}/*gpgme.la diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 647fa19f..7c3d66f6 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,30 @@  2004-12-07  Marcus Brinkmann  <[email protected]> +	* putc_unlocked.c, funopen.c: I just claim copyright on these +	files and change their license to LGPL, because they are totally +	trivial wrapper functions. +	* isascii.c: Change copyright notice to the one from ctype/ctype.h +	in the GNU C Library (CVS Head 2004-10-10), where isascii is +	defined as a macro doing exactly the same as the function in this +	file. +	* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06). +	* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10). +	* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c, +	ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c, +	data.c, data-compat.c, data-fd.c, data.h, data-mem.c, +	data-stream.c, data-user.c, debug.c, debug.h, decrypt.c, +	decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, +	engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c, +	export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h, +	key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c, +	passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c, +	rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c, +	util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c, +	wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change +	license to LGPL. + +2004-12-07  Marcus Brinkmann  <[email protected]> +  	* libgpgme.vers (GPGME_1.1): New version.  	* engine-backend.h (struct engine_ops): Add argument FILE_NAME to  	member get_version().  Add arguments FILE_NAME and HOME_DIR to diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am index 00f8c4db..b2147d96 100644 --- a/gpgme/Makefile.am +++ b/gpgme/Makefile.am @@ -1,20 +1,20 @@  # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002, 2003 g10 Code GmbH +# Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in diff --git a/gpgme/ath-compat.c b/gpgme/ath-compat.c index a4bd3f16..71ca6bc4 100644 --- a/gpgme/ath-compat.c +++ b/gpgme/ath-compat.c @@ -1,22 +1,22 @@  /* ath.c - self-adapting thread-safeness library - *      Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2002, 2004 g10 Code GmbH + +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/ath-pth-compat.c b/gpgme/ath-pth-compat.c index 75b6fb4f..1827bb47 100644 --- a/gpgme/ath-pth-compat.c +++ b/gpgme/ath-pth-compat.c @@ -1,22 +1,22 @@  /* ath-pth.c - Pth module for self-adapting thread-safeness library - *      Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2002, 2004 g10 Code GmbH + +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #include <stdlib.h>  #include <errno.h> diff --git a/gpgme/ath-pth.c b/gpgme/ath-pth.c index 2c7cd5aa..4c883a34 100644 --- a/gpgme/ath-pth.c +++ b/gpgme/ath-pth.c @@ -1,21 +1,22 @@  /* ath-pth.c - Pth module for self-adapting thread-safeness library -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H diff --git a/gpgme/ath-pthread-compat.c b/gpgme/ath-pthread-compat.c index 365cf97c..d8b340fe 100644 --- a/gpgme/ath-pthread-compat.c +++ b/gpgme/ath-pthread-compat.c @@ -1,22 +1,22 @@  /* ath-pthread.c - pthread module for self-adapting thread-safeness library - *      Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2002, 2004 g10 Code GmbH +  +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #include <stdlib.h>  #include <errno.h> diff --git a/gpgme/ath-pthread.c b/gpgme/ath-pthread.c index 94a4f599..b201f089 100644 --- a/gpgme/ath-pthread.c +++ b/gpgme/ath-pthread.c @@ -1,22 +1,22 @@  /* ath-pthread.c - pthread module for self-adapting thread-safeness library -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ - +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/ath.c b/gpgme/ath.c index 6390ecc4..71382b3c 100644 --- a/gpgme/ath.c +++ b/gpgme/ath.c @@ -1,21 +1,22 @@  /* ath.c - Thread-safeness library. -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/ath.h b/gpgme/ath.h index 04dfb285..17fb1fd9 100644 --- a/gpgme/ath.h +++ b/gpgme/ath.h @@ -1,21 +1,22 @@  /* ath.h - Interfaces for thread-safeness library. -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef ATH_H  #define ATH_H diff --git a/gpgme/context.h b/gpgme/context.h index 83ee6aa5..3afd61bd 100644 --- a/gpgme/context.h +++ b/gpgme/context.h @@ -1,22 +1,23 @@  /* context.h - Definitions for a GPGME context.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef CONTEXT_H  #define CONTEXT_H diff --git a/gpgme/conversion.c b/gpgme/conversion.c index 12a58229..16854e5f 100644 --- a/gpgme/conversion.c +++ b/gpgme/conversion.c @@ -1,22 +1,23 @@  /* conversion.c - String conversion helper functions.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data-compat.c b/gpgme/data-compat.c index c8d31e71..6b6663b3 100644 --- a/gpgme/data-compat.c +++ b/gpgme/data-compat.c @@ -4,18 +4,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data-fd.c b/gpgme/data-fd.c index b120ca00..e3542bad 100644 --- a/gpgme/data-fd.c +++ b/gpgme/data-fd.c @@ -1,21 +1,22 @@  /* data-fd.c - A file descripor based data object. -   Copyright (C) 2002 g10 Code GmbH +   Copyright (C) 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data-mem.c b/gpgme/data-mem.c index 6d11899b..4045b956 100644 --- a/gpgme/data-mem.c +++ b/gpgme/data-mem.c @@ -1,21 +1,22 @@  /* data-mem.c - A memory based data object. -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data-stream.c b/gpgme/data-stream.c index 3abecaaf..298ffb43 100644 --- a/gpgme/data-stream.c +++ b/gpgme/data-stream.c @@ -4,18 +4,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data-user.c b/gpgme/data-user.c index 6f12c35e..8a71b885 100644 --- a/gpgme/data-user.c +++ b/gpgme/data-user.c @@ -1,21 +1,22 @@  /* data-user.c - A user callback based data object. -   Copyright (C) 2002 g10 Code GmbH +   Copyright (C) 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data.c b/gpgme/data.c index c30e6eca..3ba644fa 100644 --- a/gpgme/data.c +++ b/gpgme/data.c @@ -1,21 +1,22 @@  /* data.c - An abstraction for data objects. -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/data.h b/gpgme/data.h index 51d89aa8..feb4a60a 100644 --- a/gpgme/data.h +++ b/gpgme/data.h @@ -1,21 +1,22 @@  /* data.h - Internal data object abstraction interface. -   Copyright (C) 2002 g10 Code GmbH +   Copyright (C) 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef DATA_H  #define DATA_H diff --git a/gpgme/debug.c b/gpgme/debug.c index f9136462..34a794d6 100644 --- a/gpgme/debug.c +++ b/gpgme/debug.c @@ -1,22 +1,23 @@  /* debug.c - helpful output in desperate situations     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/debug.h b/gpgme/debug.h index 4bc42cfa..b05e167b 100644 --- a/gpgme/debug.h +++ b/gpgme/debug.h @@ -1,22 +1,22 @@  /* debug.h - interface to debugging functions - *      Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2002, 2004 g10 Code GmbH +  +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #ifndef DEBUG_H  #define DEBUG_H diff --git a/gpgme/decrypt-verify.c b/gpgme/decrypt-verify.c index ef7f79b8..2fa3bb24 100644 --- a/gpgme/decrypt-verify.c +++ b/gpgme/decrypt-verify.c @@ -1,22 +1,23 @@  /* decrypt-verify.c - Decrypt and verify function.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/decrypt.c b/gpgme/decrypt.c index b37d28e9..c235be4a 100644 --- a/gpgme/decrypt.c +++ b/gpgme/decrypt.c @@ -5,18 +5,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/delete.c b/gpgme/delete.c index 30dd4500..38f2fddb 100644 --- a/gpgme/delete.c +++ b/gpgme/delete.c @@ -1,21 +1,22 @@  /* delete.c - Delete a key. -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/edit.c b/gpgme/edit.c index 8c538f3a..9ef450f0 100644 --- a/gpgme/edit.c +++ b/gpgme/edit.c @@ -1,21 +1,22 @@  /* edit.c - Key edit function. -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/encrypt-sign.c b/gpgme/encrypt-sign.c index ae4b594a..7e3d2ed6 100644 --- a/gpgme/encrypt-sign.c +++ b/gpgme/encrypt-sign.c @@ -1,22 +1,23 @@  /* encrypt-sign.c -  encrypt and verify functions     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c index 6eb177e0..a7a1f4de 100644 --- a/gpgme/encrypt.c +++ b/gpgme/encrypt.c @@ -1,22 +1,23 @@  /* encrypt.c - Encrypt function.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/engine-backend.h b/gpgme/engine-backend.h index bf481cf1..48631199 100644 --- a/gpgme/engine-backend.h +++ b/gpgme/engine-backend.h @@ -1,21 +1,22 @@ -/* engine-backend.h -  A crypto backend for the engine interface. -   Copyright (C) 2002, 2003 g10 Code GmbH +/* engine-backend.h - A crypto backend for the engine interface. +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef ENGINE_BACKEND_H  #define ENGINE_BACKEND_H diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 10952be4..6aae0183 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -5,18 +5,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/engine.c b/gpgme/engine.c index f2edc7da..abab84e1 100644 --- a/gpgme/engine.c +++ b/gpgme/engine.c @@ -1,22 +1,23 @@  /* engine.c - GPGME engine support.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/engine.h b/gpgme/engine.h index 72659cd3..b7489379 100644 --- a/gpgme/engine.h +++ b/gpgme/engine.h @@ -1,22 +1,23 @@ -/* engine.h -  GPGME engine interface. +/* engine.h - GPGME engine interface.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef ENGINE_H  #define ENGINE_H diff --git a/gpgme/error.c b/gpgme/error.c index b17bb093..6f37ef7d 100644 --- a/gpgme/error.c +++ b/gpgme/error.c @@ -1,21 +1,22 @@  /* error.c - Error handling for GPGME. -   Copyright (C) 2003 g10 Code GmbH +   Copyright (C) 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/export.c b/gpgme/export.c index 59c68964..079a7e0e 100644 --- a/gpgme/export.c +++ b/gpgme/export.c @@ -1,22 +1,23 @@  /* export.c - Export a key.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/funopen.c b/gpgme/funopen.c index e768b057..55b32230 100644 --- a/gpgme/funopen.c +++ b/gpgme/funopen.c @@ -1,22 +1,22 @@  /* funopen.c - Replacement for funopen. - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2004 g10 Code GmbH + +   This file is part of GPGME + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #ifdef HAVE_CONFIG_H  #include <config.h> @@ -32,12 +32,11 @@ funopen(const void *cookie, cookie_read_function_t *readfn,  	cookie_close_function_t *closefn)  {    cookie_io_functions_t io = { read: readfn, write: writefn,  -			       seek: seekfn, -			       close: closefn }; +			       seek: seekfn, close: closefn };    return fopencookie ((void *) cookie, -		      readfn ? ( writefn ? "rw" : "r" ) -		      : ( writefn ? "w" : ""), io); +		      readfn ? (writefn ? "rw" : "r") +		      : (writefn ? "w" : ""), io);  }  #else  #error No known way to implement funopen. diff --git a/gpgme/genkey.c b/gpgme/genkey.c index 229e7acb..3489c89b 100644 --- a/gpgme/genkey.c +++ b/gpgme/genkey.c @@ -1,22 +1,23 @@  /* genkey.c - Key generation.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/get-env.c b/gpgme/get-env.c index 577498f4..bea8949c 100644 --- a/gpgme/get-env.c +++ b/gpgme/get-env.c @@ -1,21 +1,22 @@  /* get_env.c - A getenv() replacement. -   Copyright (C) 2003 g10 Code GmbH +   Copyright (C) 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c index d89a8db2..338d7285 100644 --- a/gpgme/gpgme.c +++ b/gpgme/gpgme.c @@ -1,22 +1,23 @@  /* gpgme.c - GnuPG Made Easy.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h index 3048472d..397e31bb 100644 --- a/gpgme/gpgme.h +++ b/gpgme/gpgme.h @@ -5,18 +5,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef GPGME_H  #define GPGME_H diff --git a/gpgme/import.c b/gpgme/import.c index 46ae72e5..ad6b776b 100644 --- a/gpgme/import.c +++ b/gpgme/import.c @@ -1,22 +1,23 @@  /* import.c - Import a key.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> @@ -1,22 +1,23 @@  /* io.h - Interface to the I/O functions.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef IO_H  #define IO_H diff --git a/gpgme/isascii.c b/gpgme/isascii.c index 565c7166..924ced0c 100644 --- a/gpgme/isascii.c +++ b/gpgme/isascii.c @@ -1,22 +1,21 @@ -/* isascii.c - Replacement for isascii. - * Copyright (C) 2002 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 +        Free Software Foundation, Inc. +   This file is part of the GNU C Library. + +   The GNU C Library 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 C Library 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 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 +   02111-1307 USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/key.c b/gpgme/key.c index 444f0679..23bd61eb 100644 --- a/gpgme/key.c +++ b/gpgme/key.c @@ -1,22 +1,23 @@  /* key.c - Key objects.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/keylist.c b/gpgme/keylist.c index 57dda54a..3d9f868c 100644 --- a/gpgme/keylist.c +++ b/gpgme/keylist.c @@ -1,22 +1,23 @@  /* keylist.c - Listing keys.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/memrchr.c b/gpgme/memrchr.c index 41d38ae1..21662b1b 100644 --- a/gpgme/memrchr.c +++ b/gpgme/memrchr.c @@ -1,39 +1,210 @@ -/* memrchr.c - Replacement for memrchr. - * Copyright (C) 2002, 2004 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* memrchr -- find the last occurrence of a byte in a memory block +   Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc. +   This file is part of the GNU C Library. +   Based on strlen implementation by Torbjorn Granlund ([email protected]), +   with help from Dan Sahlin ([email protected]) and +   commentary by Jim Blandy ([email protected]); +   adaptation to memchr suggested by Dick Karpinski ([email protected]), +   and implemented by Roland McGrath ([email protected]). + +   The GNU C Library 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 C Library 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 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 +   02111-1307 USA.  */ + +#include <stdlib.h>  #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> +#endif + +#undef __ptr_t +#if defined __cplusplus || (defined __STDC__ && __STDC__) +# define __ptr_t void * +#else /* Not C++ or ANSI C.  */ +# define __ptr_t char * +#endif /* C++ or ANSI C.  */ + +#if defined _LIBC +# include <string.h> +# include <memcopy.h> +#else +# define reg_char char +#endif + +#if defined HAVE_LIMITS_H || defined _LIBC +# include <limits.h> +#endif + +#define LONG_MAX_32_BITS 2147483647 + +#ifndef LONG_MAX +# define LONG_MAX LONG_MAX_32_BITS  #endif -#include <string.h> +#include <sys/types.h> -void * -memrchr (const void *block, int c, size_t size) +#undef __memrchr +#undef memrchr + +#ifndef weak_alias +# define __memrchr memrchr +#endif + +/* Search no more than N bytes of S for C.  */ +__ptr_t +__memrchr (s, c_in, n) +     const __ptr_t s; +     int c_in; +     size_t n;  { -  const unsigned char *p = block; +  const unsigned char *char_ptr; +  const unsigned long int *longword_ptr; +  unsigned long int longword, magic_bits, charmask; +  unsigned reg_char c; + +  c = (unsigned char) c_in; + +  /* Handle the last few characters by reading one character at a time. +     Do this until CHAR_PTR is aligned on a longword boundary.  */ +  for (char_ptr = (const unsigned char *) s + n; +       n > 0 && ((unsigned long int) char_ptr +		 & (sizeof (longword) - 1)) != 0; +       --n) +    if (*--char_ptr == c) +      return (__ptr_t) char_ptr; + +  /* All these elucidatory comments refer to 4-byte longwords, +     but the theory applies equally well to 8-byte longwords.  */ + +  longword_ptr = (const unsigned long int *) char_ptr; + +  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits +     the "holes."  Note that there is a hole just to the left of +     each byte, with an extra at the end: + +     bits:  01111110 11111110 11111110 11111111 +     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD + +     The 1-bits make sure that carries propagate to the next 0-bit. +     The 0-bits provide holes for carries to fall into.  */ + +  if (sizeof (longword) != 4 && sizeof (longword) != 8) +    abort (); -  if (size) +#if LONG_MAX <= LONG_MAX_32_BITS +  magic_bits = 0x7efefeff; +#else +  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; +#endif + +  /* Set up a longword, each of whose bytes is C.  */ +  charmask = c | (c << 8); +  charmask |= charmask << 16; +#if LONG_MAX > LONG_MAX_32_BITS +  charmask |= charmask << 32; +#endif + +  /* Instead of the traditional loop which tests each character, +     we will test a longword at a time.  The tricky part is testing +     if *any of the four* bytes in the longword in question are zero.  */ +  while (n >= sizeof (longword))      { -      for (p += size - 1; size; p--, size--) -        if (*p == c) -          return (void *)p; +      /* We tentatively exit the loop if adding MAGIC_BITS to +	 LONGWORD fails to change any of the hole bits of LONGWORD. + +	 1) Is this safe?  Will it catch all the zero bytes? +	 Suppose there is a byte with all zeros.  Any carry bits +	 propagating from its left will fall into the hole at its +	 least significant bit and stop.  Since there will be no +	 carry from its most significant bit, the LSB of the +	 byte to the left will be unchanged, and the zero will be +	 detected. + +	 2) Is this worthwhile?  Will it ignore everything except +	 zero bytes?  Suppose every byte of LONGWORD has a bit set +	 somewhere.  There will be a carry into bit 8.  If bit 8 +	 is set, this will carry into bit 16.  If bit 8 is clear, +	 one of bits 9-15 must be set, so there will be a carry +	 into bit 16.  Similarly, there will be a carry into bit +	 24.  If one of bits 24-30 is set, there will be a carry +	 into bit 31, so all of the hole bits will be changed. + +	 The one misfire occurs when bits 24-30 are clear and bit +	 31 is set; in this case, the hole at bit 31 is not +	 changed.  If we had access to the processor carry flag, +	 we could close this loophole by putting the fourth hole +	 at bit 32! + +	 So it ignores everything except 128's, when they're aligned +	 properly. + +	 3) But wait!  Aren't we looking for C, not zero? +	 Good point.  So what we do is XOR LONGWORD with a longword, +	 each of whose bytes is C.  This turns each byte that is C +	 into a zero.  */ + +      longword = *--longword_ptr ^ charmask; + +      /* Add MAGIC_BITS to LONGWORD.  */ +      if ((((longword + magic_bits) + +	    /* Set those bits that were unchanged by the addition.  */ +	    ^ ~longword) + +	   /* Look at only the hole bits.  If any of the hole bits +	      are unchanged, most likely one of the bytes was a +	      zero.  */ +	   & ~magic_bits) != 0) +	{ +	  /* Which of the bytes was C?  If none of them were, it was +	     a misfire; continue the search.  */ + +	  const unsigned char *cp = (const unsigned char *) longword_ptr; + +#if LONG_MAX > 2147483647 +	  if (cp[7] == c) +	    return (__ptr_t) &cp[7]; +	  if (cp[6] == c) +	    return (__ptr_t) &cp[6]; +	  if (cp[5] == c) +	    return (__ptr_t) &cp[5]; +	  if (cp[4] == c) +	    return (__ptr_t) &cp[4]; +#endif +	  if (cp[3] == c) +	    return (__ptr_t) &cp[3]; +	  if (cp[2] == c) +	    return (__ptr_t) &cp[2]; +	  if (cp[1] == c) +	    return (__ptr_t) &cp[1]; +	  if (cp[0] == c) +	    return (__ptr_t) cp; +	} + +      n -= sizeof (longword);      } -  return NULL; + +  char_ptr = (const unsigned char *) longword_ptr; + +  while (n-- > 0) +    { +      if (*--char_ptr == c) +	return (__ptr_t) char_ptr; +    } + +  return 0;  } +#ifdef weak_alias +weak_alias (__memrchr, memrchr) +#endif diff --git a/gpgme/mkstatus b/gpgme/mkstatus index cc57969c..e64ab194 100755 --- a/gpgme/mkstatus +++ b/gpgme/mkstatus @@ -6,18 +6,18 @@  #  # This file is part of GPGME.  # -# GPGME 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. -# -# GPGME 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 +# GPGME 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. +#  +# GPGME 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 copy of the GNU Lesser 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  # resetting collate is important, so that the bsearch works properly diff --git a/gpgme/op-support.c b/gpgme/op-support.c index 7321af43..ba220a3b 100644 --- a/gpgme/op-support.c +++ b/gpgme/op-support.c @@ -1,21 +1,22 @@  /* op-support.c  -   Copyright (C) 2002, 2003 g10 Code GmbH +   Copyright (C) 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/ops.h b/gpgme/ops.h index 79ac7d41..3b4c2cde 100644 --- a/gpgme/ops.h +++ b/gpgme/ops.h @@ -1,22 +1,23 @@  /* ops.h - Internal operation support.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef OPS_H  #define OPS_H diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c index 330246b7..921b69c0 100644 --- a/gpgme/passphrase.c +++ b/gpgme/passphrase.c @@ -1,22 +1,23 @@  /* passphrase.c - Passphrase callback.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c index 5c9baaca..3e85bfa4 100644 --- a/gpgme/posix-io.c +++ b/gpgme/posix-io.c @@ -1,22 +1,23 @@  /* posix-io.c - Posix I/O functions     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002 g10 Code GmbH +   Copyright (C) 2001, 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/posix-sema.c b/gpgme/posix-sema.c index 45ca7289..61b610fd 100644 --- a/gpgme/posix-sema.c +++ b/gpgme/posix-sema.c @@ -1,22 +1,23 @@  /* posix-sema.c      Copyright (C) 2001 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002 g10 Code GmbH +   Copyright (C) 2001, 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/posix-util.c b/gpgme/posix-util.c index 47d4cca3..45bfa5de 100644 --- a/gpgme/posix-util.c +++ b/gpgme/posix-util.c @@ -1,22 +1,23 @@  /* posix-util.c - Utility functions for Posix     Copyright (C) 2001 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002 g10 Code GmbH +   Copyright (C) 2001, 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/progress.c b/gpgme/progress.c index eb40421e..4fe6b635 100644 --- a/gpgme/progress.c +++ b/gpgme/progress.c @@ -1,22 +1,23 @@  /* progress.c -  status handler for progress status     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/putc_unlocked.c b/gpgme/putc_unlocked.c index 02c64613..a15aade8 100644 --- a/gpgme/putc_unlocked.c +++ b/gpgme/putc_unlocked.c @@ -1,22 +1,22 @@  /* putc_unlocked.c - Replacement for putc_unlocked. - * Copyright (C) 2002 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2004 g10 Code GmbH + +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c index 3d7d4c82..0667f863 100644 --- a/gpgme/rungpg.c +++ b/gpgme/rungpg.c @@ -1,22 +1,23 @@  /* rungpg.c - Gpg Engine.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/sema.h b/gpgme/sema.h index 2c0842e1..0ee20742 100644 --- a/gpgme/sema.h +++ b/gpgme/sema.h @@ -1,22 +1,23 @@  /* sema.h - Definitions for semaphores.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef SEMA_H  #define SEMA_H diff --git a/gpgme/sign.c b/gpgme/sign.c index 2c0ae3f9..310f9179 100644 --- a/gpgme/sign.c +++ b/gpgme/sign.c @@ -1,22 +1,23 @@  /* sign.c - Signing function.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/signers.c b/gpgme/signers.c index a5662a27..f1ce58f1 100644 --- a/gpgme/signers.c +++ b/gpgme/signers.c @@ -1,22 +1,23 @@  /* signers.c - Maintain signer sets.     Copyright (C) 2001 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/stpcpy.c b/gpgme/stpcpy.c index a01636cd..6e42911f 100644 --- a/gpgme/stpcpy.c +++ b/gpgme/stpcpy.c @@ -1,23 +1,20 @@ -/* stpcpy.c -- copy a string and return pointer to end of new string -   Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1997, 2002, 2004 Free Software Foundation, Inc. +   This file is part of the GNU C Library. -   NOTE: The canonical source of this file is maintained with the GNU C Library. -   Bugs can be reported to [email protected]. +   The GNU C Library 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. -   This program 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, or (at your option) any -   later version. - -   This program is distributed in the hope that it will be useful, +   The GNU C Library 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. +   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 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.  */ +   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 +   02111-1307 USA.  */  #ifdef HAVE_CONFIG_H  # include <config.h> @@ -34,7 +31,9 @@  /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */  char * -__stpcpy (char *dest, const char *src) +__stpcpy (dest, src) +     char *dest; +     const char *src;  {    register char *d = dest;    register const char *s = src; @@ -45,6 +44,12 @@ __stpcpy (char *dest, const char *src)    return d - 1;  } +#ifdef libc_hidden_def +libc_hidden_def (__stpcpy) +#endif  #ifdef weak_alias  weak_alias (__stpcpy, stpcpy)  #endif +#ifdef libc_hidden_builtin_def +libc_hidden_builtin_def (stpcpy) +#endif diff --git a/gpgme/trust-item.c b/gpgme/trust-item.c index bc60df42..4dd0c4e5 100644 --- a/gpgme/trust-item.c +++ b/gpgme/trust-item.c @@ -1,22 +1,23 @@  /* trust-item.c - Trust item objects.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c index 942cc53b..f33860a4 100644 --- a/gpgme/trustlist.c +++ b/gpgme/trustlist.c @@ -1,22 +1,23 @@  /* trustlist.c - Trust item listing.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/util.h b/gpgme/util.h index 085b37c1..0a6f684a 100644 --- a/gpgme/util.h +++ b/gpgme/util.h @@ -1,22 +1,23 @@  /* util.h      Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef UTIL_H  #define UTIL_H diff --git a/gpgme/verify.c b/gpgme/verify.c index 80593e9d..7e5fd601 100644 --- a/gpgme/verify.c +++ b/gpgme/verify.c @@ -5,18 +5,19 @@     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/version.c b/gpgme/version.c index d4d78643..d1d2c2f5 100644 --- a/gpgme/version.c +++ b/gpgme/version.c @@ -1,22 +1,23 @@  /* version.c - Version check routines.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c index 24082bd1..5b64120b 100644 --- a/gpgme/w32-io.c +++ b/gpgme/w32-io.c @@ -1,22 +1,23 @@  /* w32-io.c - W32 API I/O functions.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/w32-sema.c b/gpgme/w32-sema.c index f5337bda..d2c0c5c0 100644 --- a/gpgme/w32-sema.c +++ b/gpgme/w32-sema.c @@ -1,22 +1,23 @@  /* w32-sema.c      Copyright (C) 2001 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002 g10 Code GmbH +   Copyright (C) 2001, 2002, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/w32-util.c b/gpgme/w32-util.c index f01555da..c62637a8 100644 --- a/gpgme/w32-util.c +++ b/gpgme/w32-util.c @@ -1,23 +1,24 @@  /* w32-util.c - Utility functions for the W32 API     Copyright (C) 1999 Free Software Foundation, Inc     Copyright (C) 2001 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c index e6422510..6d75d3d1 100644 --- a/gpgme/wait-global.c +++ b/gpgme/wait-global.c @@ -1,22 +1,23 @@  /* wait-global.c      Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/wait-private.c b/gpgme/wait-private.c index c9c5ce55..166b7132 100644 --- a/gpgme/wait-private.c +++ b/gpgme/wait-private.c @@ -1,22 +1,23 @@  /* wait-private.c      Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/wait-user.c b/gpgme/wait-user.c index 1fbe9cb2..3800b4f4 100644 --- a/gpgme/wait-user.c +++ b/gpgme/wait-user.c @@ -1,22 +1,23 @@ -/* wait.c  +/* wait-user.c      Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/wait.c b/gpgme/wait.c index b874c570..f3cc8f68 100644 --- a/gpgme/wait.c +++ b/gpgme/wait.c @@ -1,22 +1,23 @@  /* wait.c      Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #if HAVE_CONFIG_H  #include <config.h> diff --git a/gpgme/wait.h b/gpgme/wait.h index 9cc17226..cec4d8d1 100644 --- a/gpgme/wait.h +++ b/gpgme/wait.h @@ -1,22 +1,23 @@  /* wait.h - Definitions for the wait queue interface.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifndef WAIT_H  #define WAIT_H diff --git a/tests/ChangeLog b/tests/ChangeLog index 563757c3..d7bc2424 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,19 @@ +2004-12-07  Marcus Brinkmann  <[email protected]> + +	* gpg/mkdemodirs: Add copyright notice. + +	* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c, +	gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c, +	gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c, +	gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c, +	gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c, +	gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c, +	gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c, +	gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c, +	gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c, +	gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c, +	t-version.c: Change license to LGPL. +  2004-08-17  Marcus Brinkmann  <[email protected]>  	* gpgsm/t-keylist.c (struct): Add new fields VALIDITY and @@ -630,7 +646,7 @@  	* tests/t-verify.c (print_sig_stat): Print info about the keys. - Copyright 2001 g10 Code GmbH + Copyright 2001, 2004 g10 Code GmbH   This file is free software; as a special exception the author gives   unlimited permission to copy and/or distribute it, with or without @@ -639,11 +655,3 @@   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. -  - - - - - - -	
\ No newline at end of file diff --git a/tests/Makefile.am b/tests/Makefile.am index d8b8f858..aee20ca1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,20 +1,21 @@ +# Makefile.am - Makefile for GPGME tests.  # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 82404c6e..ceda8698 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -1,20 +1,20 @@  # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in diff --git a/tests/gpg/mkdemodirs b/tests/gpg/mkdemodirs index 7c3bd047..ab2c5687 100755 --- a/tests/gpg/mkdemodirs +++ b/tests/gpg/mkdemodirs @@ -1,4 +1,21 @@  #!/bin/sh +# Copyright (C) 2004 g10 Code GmbH +#  +# This file is part of GPGME. +#  +# GPGME 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. +#  +# GPGME 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 copy of the GNU Lesser 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  set -e @@ -36,9 +53,3 @@ done  echo "."  [ -f ./tdb.tmp ] && rm ./tdb.tmp  rm pubdemo.gpg secdemo.gpg - - - - - - diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c index 5cdfa073..697d3834 100644 --- a/tests/gpg/t-decrypt-verify.c +++ b/tests/gpg/t-decrypt-verify.c @@ -1,22 +1,23 @@  /* t-decrypt-verify.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c index c9f6eb16..2a2f4d7b 100644 --- a/tests/gpg/t-decrypt.c +++ b/tests/gpg/t-decrypt.c @@ -1,22 +1,23 @@  /* t-decrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index fb69e549..f2f406de 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -1,22 +1,23 @@  /* t-edit.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c index 7885b62a..9da5ff0d 100644 --- a/tests/gpg/t-encrypt-sign.c +++ b/tests/gpg/t-encrypt-sign.c @@ -1,22 +1,23 @@ -/* t-encrypt.c - Regression test. +/* t-encrypt-sign.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c index 015ff196..51a3fc1b 100644 --- a/tests/gpg/t-encrypt-sym.c +++ b/tests/gpg/t-encrypt-sym.c @@ -1,22 +1,23 @@  /* t-encrypt-sym.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c index c1806680..264f31a3 100644 --- a/tests/gpg/t-encrypt.c +++ b/tests/gpg/t-encrypt.c @@ -1,22 +1,23 @@  /* t-encrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c index 7b08ba89..bf1ab4ef 100644 --- a/tests/gpg/t-eventloop.c +++ b/tests/gpg/t-eventloop.c @@ -1,22 +1,23 @@ -/* t-eventloop.c  - regression test +/* t-eventloop.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c index ddac43e1..f469843b 100644 --- a/tests/gpg/t-export.c +++ b/tests/gpg/t-export.c @@ -1,22 +1,23 @@  /* t-export.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-genkey.c b/tests/gpg/t-genkey.c index 09bbd1ea..407824f6 100644 --- a/tests/gpg/t-genkey.c +++ b/tests/gpg/t-genkey.c @@ -1,22 +1,23 @@ -/* t-genkey.c - regression test +/* t-genkey.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c index b2c11aa7..db5f9257 100644 --- a/tests/gpg/t-import.c +++ b/tests/gpg/t-import.c @@ -1,22 +1,23 @@ -/* t-import.c  - regression test +/* t-import.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c index 41fa4af0..e3e577bd 100644 --- a/tests/gpg/t-keylist-sig.c +++ b/tests/gpg/t-keylist-sig.c @@ -1,22 +1,23 @@  /* t-keylist-sig.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c index 41332f6f..a653665f 100644 --- a/tests/gpg/t-keylist.c +++ b/tests/gpg/t-keylist.c @@ -1,22 +1,23 @@  /* t-keylist.c  - regression test     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index ae366ff9..3b71dc48 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -1,22 +1,23 @@  /* t-sign.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c index 199942ed..c75c1d43 100644 --- a/tests/gpg/t-signers.c +++ b/tests/gpg/t-signers.c @@ -1,22 +1,23 @@  /* t-signers.c - Regression tests for the multiple signers interface.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h index 54880557..b48c7f02 100644 --- a/tests/gpg/t-support.h +++ b/tests/gpg/t-support.h @@ -1,22 +1,23 @@  /* t-support.h - Helper routines for regression tests.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #include <unistd.h>  #include <errno.h> diff --git a/tests/gpg/t-thread1.c b/tests/gpg/t-thread1.c index cc2e010f..86ea51af 100644 --- a/tests/gpg/t-thread1.c +++ b/tests/gpg/t-thread1.c @@ -1,22 +1,23 @@  /* t-thread1.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c index 677ecec0..77076392 100644 --- a/tests/gpg/t-trustlist.c +++ b/tests/gpg/t-trustlist.c @@ -1,22 +1,23 @@  /* t-trustlist.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c index bf0b8876..1b63829c 100644 --- a/tests/gpg/t-verify.c +++ b/tests/gpg/t-verify.c @@ -1,22 +1,23 @@  /* t-verify.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index ba2e8d5a..2be6c625 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -3,18 +3,18 @@  #   # This file is part of GPGME.  #  -# GPGME 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. +# GPGME 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.  #  -# GPGME 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. +# GPGME 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 copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  ## Process this file with automake to produce Makefile.in diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c index db507f0f..654c7e12 100644 --- a/tests/gpgsm/t-decrypt.c +++ b/tests/gpgsm/t-decrypt.c @@ -1,23 +1,23 @@  /* t-encrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ - +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c index a5c2dc1b..45c772b8 100644 --- a/tests/gpgsm/t-encrypt.c +++ b/tests/gpgsm/t-encrypt.c @@ -1,22 +1,23 @@  /* t-encrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c index 9139f8c6..d8856f27 100644 --- a/tests/gpgsm/t-export.c +++ b/tests/gpgsm/t-export.c @@ -1,22 +1,23 @@  /* t-export.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c index 0c67597c..9de9d547 100644 --- a/tests/gpgsm/t-genkey.c +++ b/tests/gpgsm/t-genkey.c @@ -1,22 +1,23 @@ -/* t-genkey.c  - regression test +/* t-genkey.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c index 50737bba..2d23779e 100644 --- a/tests/gpgsm/t-import.c +++ b/tests/gpgsm/t-import.c @@ -1,22 +1,23 @@  /* t-import.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c index be4e7cc6..5c595712 100644 --- a/tests/gpgsm/t-keylist.c +++ b/tests/gpgsm/t-keylist.c @@ -1,22 +1,23 @@  /* t-keylist.c  - regression test     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c index 406c72f4..dc2d841e 100644 --- a/tests/gpgsm/t-sign.c +++ b/tests/gpgsm/t-sign.c @@ -1,22 +1,23 @@  /* t-sign.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2003 g10 Code GmbH +   Copyright (C) 2001, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h index 32a7b19e..671317ff 100644 --- a/tests/gpgsm/t-support.h +++ b/tests/gpgsm/t-support.h @@ -1,22 +1,23 @@  /* t-support.h - Helper routines for regression tests.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #include <unistd.h>  #include <errno.h> diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c index 19652e37..81662068 100644 --- a/tests/gpgsm/t-verify.c +++ b/tests/gpgsm/t-verify.c @@ -1,22 +1,23 @@  /* t-verify.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn) -   Copyright (C) 2001, 2002, 2003 g10 Code GmbH +   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/t-data.c b/tests/t-data.c index 8e61dba7..713da0a6 100644 --- a/tests/t-data.c +++ b/tests/t-data.c @@ -1,22 +1,22 @@  /* t-data - Regression tests for the gpgme_data_t abstraction. - *      Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +   Copyright (C) 2001, 2004 g10 Code GmbH + +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  /* We need to include config.h so that we know whether we are building     with large file system (LFS) support. */ diff --git a/tests/t-engine-info.c b/tests/t-engine-info.c index 2705b48b..4af2d4a3 100644 --- a/tests/t-engine-info.c +++ b/tests/t-engine-info.c @@ -1,21 +1,22 @@  /* t-engine-info.c - Regression test for gpgme_get_engine_info. -   Copyright (C) 2003 g10 Code GmbH +   Copyright (C) 2003, 2004 g10 Code GmbH     This file is part of GPGME.     GPGME 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. -  +   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. +        GPGME 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 GPGME; if not, write to the Free Software Foundation, -   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ +   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., 59 Temple Place - Suite 330, Boston, MA +   02111-1307, USA.  */  #ifdef HAVE_CONFIG_H  #include <config.h> diff --git a/tests/t-version.c b/tests/t-version.c index 5778b6bd..06bff60a 100644 --- a/tests/t-version.c +++ b/tests/t-version.c @@ -1,22 +1,22 @@ -/* t-version.c  - regression test - *      Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME 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. - * - * GPGME 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* t-version.c - Regression test. +   Copyright (C) 2001, 2004 g10 Code GmbH + +   This file is part of GPGME. + +   GPGME 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. +    +   GPGME 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 copy of the GNU Lesser 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.  */  #ifdef HAVE_CONFIG_H  #include <config.h>  | 
