[svn] gpgme - r1314 - in trunk: . doc gpgme
svn author wk
cvs at cvs.gnupg.org
Wed Jun 4 16:14:42 CEST 2008
Author: wk
Date: 2008-06-04 16:14:38 +0200 (Wed, 04 Jun 2008)
New Revision: 1314
Added:
trunk/doc/gpl.texi
Modified:
trunk/NEWS
trunk/doc/ChangeLog
trunk/doc/Makefile.am
trunk/doc/gpgme.texi
trunk/doc/lesser.texi
trunk/gpgme/gpgme.h
Log:
Include the GnuPG UI Server specification.
Change the license of the manual to GPLv3+.
[The diff below has been truncated]
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2008-05-09 08:26:28 UTC (rev 1313)
+++ trunk/doc/ChangeLog 2008-06-04 14:14:38 UTC (rev 1314)
@@ -1,3 +1,9 @@
+2008-06-04 Werner Koch <wk at g10code.com>
+
+ * gpgme.texi: Use @copying command. Change license to
+ GPLv3. Include protocol specis from GpgOL and GPGEx. Minor
+ cleanups.
+
2008-03-11 Marcus Brinkmann <marcus at g10code.de>
* gpgme.texi (File Based Data Buffers): Document the need for
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-05-09 08:26:28 UTC (rev 1313)
+++ trunk/NEWS 2008-06-04 14:14:38 UTC (rev 1314)
@@ -12,6 +12,9 @@
applications (it only affects the S/MIME backend on certain
operations).
+ * The reference manual now includes the specification of "The GnuPG
+ UI Server protocol".
+
* Interface changes relative to the 1.1.6 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gpgme_op_encrypt CHANGED: Output encoding can affect result.
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-05-09 08:26:28 UTC (rev 1313)
+++ trunk/doc/Makefile.am 2008-06-04 14:14:38 UTC (rev 1314)
@@ -22,7 +22,7 @@
DISTCLEANFILES = gpgme.tmp
info_TEXINFOS = gpgme.texi
-gpgme_TEXINFOS = lesser.texi
+gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
online: gpgme.html gpgme.pdf
set -e; \
Modified: trunk/doc/gpgme.texi
===================================================================
--- trunk/doc/gpgme.texi 2008-05-09 08:26:28 UTC (rev 1313)
+++ trunk/doc/gpgme.texi 2008-06-04 14:14:38 UTC (rev 1314)
@@ -1,4 +1,5 @@
-()\input texinfo @c -*- Texinfo -*-
+\input texinfo @c -*- mode: texinfo; coding: latin-1; -*-
+ at documentencoding ISO-8859-1
@setfilename gpgme.info
@settitle The `GnuPG Made Easy' Reference Manual
@@ -7,12 +8,41 @@
* @acronym{GPGME}: (gpgme). Adding support for cryptography to your program.
@end direntry
- at include version.texi
-
@c Unify some of the indices.
@syncodeindex tp fn
@syncodeindex pg fn
+ at copying
+Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008 g10 Code GmbH.
+
+ at quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version. The text of the license can be found in the
+section entitled ``Copying''.
+ at end quotation
+
+This document 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.
+ at end copying
+
+ at include version.texi
+
+ at c Macros used by the description of the UI server protocol
+ at macro clnt
+ @sc{c:} @c
+ at end macro
+ at macro srvr
+ @sc{s:} @c
+ at end macro
+
+
+ at c
+ at c T I T L E P A G E
+ at c
@ifinfo
This file documents the @acronym{GPGME} library.
@@ -21,27 +51,14 @@
@value{VERSION}.
@c NOTE: Don't forget to update the year for the TeX version, too.
-Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007 g10 Code GmbH.
+ at insertcopying
-The GPGME reference manual 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 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
-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
-
@end ifinfo
- at iftex
- at shorttitlepage The `GnuPG Made Easy' Reference Manual
- at end iftex
+ at c We do not want that bastard short titlepage.
+ at c @iftex
+ at c @shorttitlepage The `GnuPG Made Easy' Reference Manual
+ at c @end iftex
@titlepage
@center @titlefont{The `GnuPG Made Easy'}
@sp 1
@@ -54,25 +71,15 @@
@center for version @value{VERSION}
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007 g10 Code GmbH.
+Published by g10 Code GmbH@* Hüttenstr. 61@* 40699 Erkrath, Germany
-
-The GPGME reference manual 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 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
-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
+ at insertcopying
@end titlepage
@page
+ at summarycontents
+ at contents
+
@ifnottex
@node Top
@top Main Menu
@@ -92,8 +99,12 @@
Appendices
+* UI Server Protocol:: The GnuPG UI Server Protocol.
+
* Library Copying:: The GNU Lesser General Public License says
how you can copy and share `GnuPG Made Easy'.
+* Copying:: The GNU General Public License says how you
+ can copy and share this manual.
Indices
@@ -5501,22 +5512,25 @@
case the state of @var{ctx} is not modified).
@end deftypefun
+ at c **********************************************************
+ at c ******************* Appendices *************************
+ at c **********************************************************
+ at include uiserver.texi
+
@include lesser.texi
+ at include gpl.texi
+ at node Function and Data Index
+ at unnumbered Function and Data Index
+
+ at printindex fn
+
@node Concept Index
@unnumbered Concept Index
@printindex cp
- at node Function and Data Index
- at unnumbered Function and Data Index
-
- at printindex fn
-
-
- at summarycontents
- at contents
@bye
Added: trunk/doc/gpl.texi
===================================================================
--- trunk/doc/gpl.texi 2008-05-09 08:26:28 UTC (rev 1313)
+++ trunk/doc/gpl.texi 2008-06-04 14:14:38 UTC (rev 1314)
@@ -0,0 +1,724 @@
+ at node Copying
+ at unnumbered GNU General Public License
+ at center Version 3, 29 June 2007
+
+ at c This file is intended to be included in another file.
+
+ at display
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+ at end display
+
+ at section Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation,
+use the GNU General Public License for most of our software; it
+applies also to any other work released this way by its authors. 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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. 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.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+ at iftex
+ at section TERMS AND CONDITIONS
+ at end iftex
+ at ifinfo
+ at center TERMS AND CONDITIONS
+ at end ifinfo
+
+ at enumerate 0
+ at item Definitions.
+
+``This License'' refers to version 3 of the GNU General Public License.
+
+``Copyright'' also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+``The Program'' refers to any copyrightable work licensed under this
+License. Each licensee is addressed as ``you''. ``Licensees'' and
+``recipients'' may be individuals or organizations.
+
+To ``modify'' a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a ``modified version'' of
+the earlier work or a work ``based on'' the earlier work.
+
+A ``covered work'' means either the unmodified Program or a work based
+on the Program.
+
+To ``propagate'' a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To ``convey'' a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays ``Appropriate Legal Notices'' to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ at item Source Code.
+
+The ``source code'' for a work means the preferred form of the work for
+making modifications to it. ``Object code'' means any non-source form
+of a work.
+
+A ``Standard Interface'' means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The ``System Libraries'' of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+``Major Component'', in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The ``Corresponding Source'' for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+ at item Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ at item Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+ at item Conveying Verbatim Copies.
+
+You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ at item Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+ at enumerate a
+ at item
+The work must carry prominent notices stating that you modified it,
+and giving a relevant date.
+
+ at item
+The work must carry prominent notices stating that it is released
+under this License and any conditions added under section 7. This
+requirement modifies the requirement in section 4 to ``keep intact all
+notices''.
+
+ at item
+You must license the entire work, as a whole, under this License to
+anyone who comes into possession of a copy. This License will
+therefore apply, along with any applicable section 7 additional terms,
+to the whole of the work, and all its parts, regardless of how they
+are packaged. This License gives no permission to license the work in
+any other way, but it does not invalidate such permission if you have
+separately received it.
+
+ at item
+If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your work
+need not make them do so.
+ at end enumerate
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+``aggregate'' if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ at item Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+ at enumerate a
+ at item
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium customarily
+used for software interchange.
+
+ at item
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a written
+offer, valid for at least three years and valid for as long as you
+offer spare parts or customer support for that product model, to give
+anyone who possesses the object code either (1) a copy of the
+Corresponding Source for all the software in the product that is
+covered by this License, on a durable physical medium customarily used
+for software interchange, for a price no more than your reasonable
+cost of physically performing this conveying of source, or (2) access
+to copy the Corresponding Source from a network server at no charge.
+
+ at item
+Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source. This alternative is
+allowed only occasionally and noncommercially, and only if you
+received the object code with such an offer, in accord with subsection
+6b.
+
+ at item
More information about the Gnupg-commits
mailing list