mirror of git://git.gnupg.org/gnupg.git
Preparing a release
This commit is contained in:
Werner Koch
parent
68629647f3
commit
d8ff6704c8
|
|
@ -1,3 +1,12 @@
|
|||
2006-12-06 Werner Koch <wk@g10code.com>
|
||||
|
||||
Released 1.4.6.
|
||||
|
||||
2006-12-04 Werner Koch <wk@g10code.com>
|
||||
|
||||
* README: Add hint on hjow to set CC_FOR_BUILD.
|
||||
* configure.ac (CC_FOR_BUILD): New.
|
||||
|
||||
2006-12-02 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* NEWS: Note the CVE for bug#728, --s2k-count,
|
||||
|
|
|
|||
11
NEWS
11
NEWS
|
|
@ -1,11 +1,14 @@
|
|||
Noteworthy changes in version 1.4.6
|
||||
Noteworthy changes in version 1.4.6 (2006-12-06)
|
||||
------------------------------------------------
|
||||
|
||||
* Fixed a serious and exploitable bug in processing encrypted
|
||||
packages. [CVE-2006-6235].
|
||||
|
||||
* Fixed a buffer overflow in gpg. [bug#728, CVE-2006-6169]
|
||||
|
||||
* Fixed a bug while decrypting certain compressed and encrypted
|
||||
messages. [bug#537]
|
||||
|
||||
* Fixed a buffer overflow in gpg. [bug#728, CVE-2006-6169]
|
||||
|
||||
* Added --s2k-count to set the number of times passphrase mangling
|
||||
is repeated. The default is 65536 times.
|
||||
|
||||
|
|
@ -23,6 +26,8 @@ Noteworthy changes in version 1.4.6
|
|||
violations pertaining to this issue, including those that may
|
||||
have occurred in the past.
|
||||
|
||||
* Man pages are now build from the same source as those of GnuPG-2.
|
||||
|
||||
|
||||
Noteworthy changes in version 1.4.5 (2006-08-01)
|
||||
------------------------------------------------
|
||||
|
|
|
|||
8
README
8
README
|
|
@ -677,6 +677,14 @@
|
|||
This doesn't matter and we know about it (actually it is due to
|
||||
some warning options which we have enabled for gcc)
|
||||
|
||||
If you are cross-compiling and you get an error either building a
|
||||
tool called "yat2m" or running that tool, the problem is most
|
||||
likely a bad or missing native compiler. We require a standard
|
||||
C-89 compiler to produce an executable to be run on the build
|
||||
platform. You can explicitly set such a compiler with configure
|
||||
arguments. On HP/UX you might want to try: "CC_FOR_BUILD=c89".
|
||||
|
||||
|
||||
|
||||
Specific problems on some machines
|
||||
----------------------------------
|
||||
|
|
|
|||
3
TODO
3
TODO
|
|
@ -70,5 +70,4 @@
|
|||
no way to issue a cancel when unsing the CLI - this would however
|
||||
be a Good Thing when used with mixed symkey/pubkey encrypted
|
||||
messages. See comment in mainproc.c:proc_symkey_enc.
|
||||
|
||||
* Copy the manual from trunk and update the Makefile.
|
||||
Note, that this has been fixed in 2.0.2 - we should backport it.
|
||||
|
|
|
|||
17
configure.ac
17
configure.ac
|
|
@ -27,7 +27,7 @@ min_automake_version="1.9.3"
|
|||
# Remember to change the version number immediately *after* a release.
|
||||
# Set my_issvn to "yes" for non-released code. Remember to run an
|
||||
# "svn up" and "autogen.sh" right before creating a distribution.
|
||||
m4_define([my_version], [1.4.6rc1])
|
||||
m4_define([my_version], [1.4.6])
|
||||
m4_define([my_issvn], [no])
|
||||
|
||||
m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
|
||||
|
|
@ -466,6 +466,21 @@ GNUPG_CHECK_FAQPROG
|
|||
GNUPG_CHECK_DOCBOOK_TO_TEXI
|
||||
GNUPG_CHECK_USTAR
|
||||
|
||||
|
||||
# According to a comment by Marcus Brinkman in libgpg-error, the
|
||||
# AC_PROG_CC_FOR_BUILD macro in the AC archive is broken for autoconf
|
||||
# 2.57. Thus we use a simply use "cc" if we are cross-compiling.
|
||||
AC_MSG_CHECKING(for cc for build)
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
|
||||
else
|
||||
CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
|
||||
fi
|
||||
AC_MSG_RESULT($CC_FOR_BUILD)
|
||||
AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
|
||||
|
||||
|
||||
|
||||
MPI_OPT_FLAGS=""
|
||||
|
||||
have_dosish_system=no
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
2006-12-04 Werner Koch <wk@g10code.com>
|
||||
|
||||
* yat2m.c: New.
|
||||
* Makefile.am: New rules to build yatm and the man pages.
|
||||
|
||||
2006-06-22 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,21 +18,20 @@
|
|||
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = no-texinfo.tex
|
||||
|
||||
EXTRA_DIST = DETAILS gpg.1 gpgv.1 faq.raw FAQ faq.html \
|
||||
EXTRA_DIST = DETAILS faq.raw FAQ faq.html \
|
||||
HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
|
||||
TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
|
||||
TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt \
|
||||
gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \
|
||||
opt-homedir.texi texi.css yat2m.c gpl.texi
|
||||
|
||||
noinst_PROGRAMS = yat2m
|
||||
myman_sources = gpg.texi gpgv.texi
|
||||
myman_pages = gpg.1 gpgv.1
|
||||
|
||||
myman_sources = gpg.texi
|
||||
myman_pages = gpg.1
|
||||
|
||||
info_TEXINFOS = gpg.texi
|
||||
info_TEXINFOS = gnupg1.texi
|
||||
|
||||
man_MANS = $(myman_pages) gnupg.7 gpg.ru.1
|
||||
|
||||
gnupg1_TEXINFOS = gnupg1.texi
|
||||
|
||||
# Need this to avoid building of dvis with automake 1.4
|
||||
DVIS =
|
||||
|
|
@ -43,13 +42,16 @@ BUILT_SOURCES = FAQ faq.html
|
|||
# we can't add gpg.texi gpgv.texi here because automake does not like them to
|
||||
# be built files.
|
||||
|
||||
CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml
|
||||
DISTCLEANFILES = yat2m-stamp.tmp yat2m-stamp $(myman_pages)
|
||||
CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml
|
||||
DISTCLEANFILES = yat2m yat2m-stamp.tmp yat2m-stamp $(myman_pages)
|
||||
|
||||
AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgone
|
||||
|
||||
YAT2M_OPTIONS = -I $(srcdir) -D gpgone \
|
||||
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
|
||||
|
||||
yat2m_SOURCES = yat2m.c
|
||||
yat2m: Makefile yat2m.c
|
||||
$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
|
||||
|
||||
yat2m-stamp: $(myman_sources)
|
||||
@rm -f yat2m-stamp.tmp
|
||||
|
|
|
|||
|
|
@ -0,0 +1,161 @@
|
|||
\input texinfo @c -*-texinfo-*-
|
||||
@c %**start of header
|
||||
@setfilename gnupg1.info
|
||||
@include version.texi
|
||||
@settitle Using the GnuPG Version 1.4
|
||||
|
||||
@c A couple of macros with no effect on texinfo
|
||||
@c but used by the yat2m processor.
|
||||
@macro manpage {a}
|
||||
@end macro
|
||||
@macro mansect {a}
|
||||
@end macro
|
||||
@macro manpause
|
||||
@end macro
|
||||
@macro mancont
|
||||
@end macro
|
||||
|
||||
@c Create a separate index for command line options.
|
||||
@defcodeindex op
|
||||
@c Merge the standard indexes into a single one.
|
||||
@syncodeindex fn cp
|
||||
@syncodeindex vr cp
|
||||
@syncodeindex ky cp
|
||||
@syncodeindex pg cp
|
||||
@syncodeindex tp cp
|
||||
@c %**end of header
|
||||
@copying
|
||||
This is the @cite{The GNU Privacy Guard Manual}
|
||||
(@value{VERSION}, @value{UPDATED}).
|
||||
|
||||
@iftex
|
||||
Published by the Free Software Foundation@*
|
||||
51 Franklin St, Fifth Floor@*
|
||||
Boston, MA 02110-1301 USA
|
||||
@end iftex
|
||||
|
||||
Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
|
||||
@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 2 of the License, or (at your
|
||||
option) any later version. The text of the license can be found in the
|
||||
section entitled ``Copying''.
|
||||
@end quotation
|
||||
@end copying
|
||||
|
||||
|
||||
@dircategory GNU Utilities
|
||||
@direntry
|
||||
* gpg: (gpg). OpenPGP encryption and signing tool (v1).
|
||||
@end direntry
|
||||
|
||||
|
||||
@c
|
||||
@c Printing stuff taken from gcc.
|
||||
@c
|
||||
@macro gnupgtabopt{body}
|
||||
@code{\body\}
|
||||
@end macro
|
||||
@macro gnupgoptlist{body}
|
||||
@smallexample
|
||||
\body\
|
||||
@end smallexample
|
||||
@end macro
|
||||
@c Makeinfo handles the above macro OK, TeX needs manual line breaks;
|
||||
@c they get lost at some point in handling the macro. But if @macro is
|
||||
@c used here rather than @alias, it produces double line breaks.
|
||||
@iftex
|
||||
@alias gol = *
|
||||
@end iftex
|
||||
@ifnottex
|
||||
@macro gol
|
||||
@end macro
|
||||
@end ifnottex
|
||||
|
||||
|
||||
@c
|
||||
@c Titlepage
|
||||
@c
|
||||
@setchapternewpage odd
|
||||
@titlepage
|
||||
@title Using the GNU Privacy Guard, Version 1.4
|
||||
@subtitle Version @value{VERSION}
|
||||
@subtitle @value{UPDATED}
|
||||
|
||||
@author Werner Koch (@email{wk@@gnupg.org})
|
||||
|
||||
@page
|
||||
@vskip 0pt plus 1filll
|
||||
@insertcopying
|
||||
@end titlepage
|
||||
|
||||
@ifnothtml
|
||||
@summarycontents
|
||||
@contents
|
||||
@page
|
||||
@end ifnothtml
|
||||
|
||||
@ifnottex
|
||||
@node Top
|
||||
@top
|
||||
@insertcopying
|
||||
|
||||
@noindent
|
||||
This manual documents how to use the standalone version of GNU Privacy Guard.
|
||||
@end ifnottex
|
||||
|
||||
@menu
|
||||
* Invoking GPG:: Using the classic GPG protocol.
|
||||
* Specify a User ID:: How to Specify a User Id.
|
||||
|
||||
* Copying:: GNU General Public License says
|
||||
how you can copy and share GnuPG
|
||||
* Option Index:: Index to command line options.
|
||||
* Index:: Index of concepts and symbol names.
|
||||
@end menu
|
||||
|
||||
@ifhtml
|
||||
|
||||
@end ifhtml
|
||||
|
||||
|
||||
@ifhtml
|
||||
@page
|
||||
@summarycontents
|
||||
@contents
|
||||
@end ifhtml
|
||||
|
||||
|
||||
@include gpg.texi
|
||||
|
||||
@node Specify a User ID
|
||||
@chapter How to Specify a User Id
|
||||
@anchor{how-to-specify-a-user-id}
|
||||
@include specify-user-id.texi
|
||||
|
||||
@include gpl.texi
|
||||
|
||||
|
||||
@c ---------------------------------------------------------------------
|
||||
@c Indexes
|
||||
@c ---------------------------------------------------------------------
|
||||
|
||||
@node Option Index
|
||||
@unnumbered Option Index
|
||||
|
||||
@printindex op
|
||||
|
||||
@node Index
|
||||
@unnumbered Index
|
||||
|
||||
@printindex cp
|
||||
|
||||
@c ---------------------------------------------------------------------
|
||||
@c Epilogue
|
||||
@c ---------------------------------------------------------------------
|
||||
|
||||
@bye
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,167 @@
|
|||
@c Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
@c This is part of the GnuPG manual.
|
||||
@c For copying conditions, see the file GnuPG.texi.
|
||||
|
||||
@c
|
||||
@c This is included by tools.texi.
|
||||
@c
|
||||
|
||||
@c Begin GnuPG 1.x specific stuff
|
||||
@ifset gpgone
|
||||
@macro gpgvname
|
||||
gpgv
|
||||
@end macro
|
||||
@manpage gpgv.1
|
||||
@node gpgv
|
||||
@section Verify OpenPGP signatures
|
||||
@ifset manverb
|
||||
.B gpgv
|
||||
\- Verify OpenPGP signatures
|
||||
@end ifset
|
||||
|
||||
@mansect synopsis
|
||||
@ifset manverb
|
||||
.B gpgv
|
||||
.RI [ options ]
|
||||
.I signed_files
|
||||
@end ifset
|
||||
@end ifset
|
||||
@c End GnuPG 1.x specific stuff
|
||||
|
||||
@c Begin GnuPG 2 specific stuff
|
||||
@ifclear gpgone
|
||||
@macro gpgvname
|
||||
gpgv2
|
||||
@end macro
|
||||
@manpage gpgv2.1
|
||||
@node gpgv
|
||||
@section Verify OpenPGP signatures
|
||||
@ifset manverb
|
||||
.B gpgv2
|
||||
\- Verify OpenPGP signatures
|
||||
@end ifset
|
||||
|
||||
@mansect synopsis
|
||||
@ifset manverb
|
||||
.B gpgv2
|
||||
.RI [ options ]
|
||||
.I signed_files
|
||||
@end ifset
|
||||
@end ifclear
|
||||
@c End GnuPG 2 specific stuff
|
||||
|
||||
|
||||
|
||||
@mansect description
|
||||
@code{@gpgvname} is an OpenPGP signature verification tool.
|
||||
|
||||
This program is actually a stripped down version of @code{gpg} which is
|
||||
only able to check signatures. It is somewhat smaller than the fully blown
|
||||
@code{gpg} and uses a different (and simpler) way to check that
|
||||
the public keys used to make the signature are valid. There are
|
||||
no configuration files and only a few options are implemented.
|
||||
|
||||
@code{@gpgvname} assumes that all keys in the keyring are trustworthy.
|
||||
By default it uses a keyring named @file{trustedkeys.gpg} which is
|
||||
assumed to be in the home directory as defined by GnuPG or set by an
|
||||
option or an environment variable. An option may be used to specify
|
||||
another keyring or even multiple keyrings.
|
||||
|
||||
@noindent
|
||||
@mansect options
|
||||
@code{@gpgvname} recognizes these options:
|
||||
|
||||
@table @gnupgtabopt
|
||||
|
||||
@item --verbose
|
||||
@itemx -v
|
||||
@opindex verbose
|
||||
Gives more information during processing. If used
|
||||
twice, the input data is listed in detail.
|
||||
|
||||
@item --quiet
|
||||
@itemx -q
|
||||
@opindex quiet
|
||||
Try to be as quiet as possible.
|
||||
|
||||
@item --keyring @var{file}
|
||||
@opindex keyring
|
||||
Add @var{file} to the list of keyrings.
|
||||
If @var{file} begins with a tilde and a slash, these
|
||||
are replaced by the HOME directory. If the filename
|
||||
does not contain a slash, it is assumed to be in the
|
||||
home-directory ("~/.gnupg" if --homedir is not used).
|
||||
|
||||
@item --status-fd @var{n}
|
||||
@opindex status-fd
|
||||
Write special status strings to the file descriptor @var{n}. See the
|
||||
file DETAILS in the documentation for a listing of them.
|
||||
|
||||
@item --logger-fd @code{n}
|
||||
@opindex logger-fd
|
||||
Write log output to file descriptor @code{n} and not to stderr.
|
||||
|
||||
@item --ignore-time-conflict
|
||||
@opindex ignore-time-conflict
|
||||
GnuPG normally checks that the timestamps associated with keys and
|
||||
signatures have plausible values. However, sometimes a signature seems to
|
||||
be older than the key due to clock problems. This option turns these
|
||||
checks into warnings.
|
||||
|
||||
@include opt-homedir.texi
|
||||
|
||||
@end table
|
||||
|
||||
@mansect return value
|
||||
|
||||
The program returns 0 if everything was fine, 1 if at least
|
||||
one signature was bad, and other error codes for fatal errors.
|
||||
|
||||
@mansect examples
|
||||
@subsection Examples
|
||||
|
||||
@table @asis
|
||||
|
||||
@item @gpgvname @code{pgpfile}
|
||||
@itemx @gpgvname @code{sigfile}
|
||||
Verify the signature of the file. The second form
|
||||
is used for detached signatures, where @code{sigfile} is the detached
|
||||
signature (either ASCII armored or binary) and are the signed
|
||||
data; if this is not given the name of the file holding the signed data is
|
||||
constructed by cutting off the extension (".asc", ".sig" or ".sign") from
|
||||
@code{sigfile}.
|
||||
|
||||
@end table
|
||||
|
||||
@mansect environment
|
||||
@subsection Environment
|
||||
|
||||
@table @asis
|
||||
|
||||
@item HOME
|
||||
Used to locate the default home directory.
|
||||
|
||||
@item GNUPGHOME
|
||||
If set directory used instead of "~/.gnupg".
|
||||
|
||||
@end table
|
||||
|
||||
@mansect files
|
||||
@subsection FILES
|
||||
|
||||
@table @asis
|
||||
|
||||
@item ~/.gnupg/trustedkeys.gpg
|
||||
The default keyring with the allowed keys
|
||||
|
||||
@end table
|
||||
|
||||
@mansect see also
|
||||
@ifset gpgone
|
||||
@command{gpg}(1)
|
||||
@end ifset
|
||||
@ifclear gpgone
|
||||
@command{gpg2}(1)
|
||||
@end ifclear
|
||||
@include see-also-note.texi
|
||||
|
||||
|
|
@ -0,0 +1,397 @@
|
|||
@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.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
@c This option is included at several places.
|
||||
@item --homedir @var{dir}
|
||||
@opindex homedir
|
||||
Set the name of the home directory to @var{dir}. If his option is not
|
||||
used, the home directory defaults to @file{~/.gnupg}. It is only
|
||||
recognized when given on the command line. It also overrides any home
|
||||
directory stated through the environment variable @env{GNUPGHOME} or
|
||||
(on W32 systems) by means on the Registry entry
|
||||
@ifset isman
|
||||
@var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
|
||||
@end ifset
|
||||
@ifclear isman
|
||||
@var{HKCU\Software\GNU\GnuPG:HomeDir}.
|
||||
@end ifclear
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
@c We append this note to all ``see also'' sections of the man pages
|
||||
|
||||
@ifset isman
|
||||
The full documentation for this tool is maintained as a Texinfo manual.
|
||||
If GnuPG and the info program are properly installed at your site, the
|
||||
command
|
||||
|
||||
@example
|
||||
info gnupg1
|
||||
@end example
|
||||
|
||||
should give you access to the complete manual including a menu structure
|
||||
and an index.
|
||||
@end ifset
|
||||
|
|
@ -0,0 +1,171 @@
|
|||
@c Include file to allow for different placements in man pages and the manual
|
||||
|
||||
There are different ways to specify a user ID to GnuPG. Some of them
|
||||
are only valid for @command{gpg} others are only good for
|
||||
@command{gpgsm}. Here is the entire list of ways to specify a key:
|
||||
|
||||
@itemize @bullet
|
||||
|
||||
@item By key Id.
|
||||
This format is deduced from the length of the string and its content or
|
||||
@code{0x} prefix. The key Id of an X.509 certificate are the low 64 bits
|
||||
of its SHA-1 fingerprint. The use of key Ids is just a shortcut, for
|
||||
all automated processing the fingerprint should be used.
|
||||
|
||||
When using @command{gpg} an exclamation mark may be appended to force
|
||||
using the specified primary or secondary key and not to try and
|
||||
calculate which primary or secondary key to use.
|
||||
|
||||
The last four lines of the example give the key ID in their long form as
|
||||
internally used by the OpenPGP protocol. You can see the long key ID
|
||||
using the option @option{--with-colons}.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
234567C4
|
||||
0F34E556E
|
||||
01347A56A
|
||||
0xAB123456
|
||||
|
||||
234AABBCC34567C4
|
||||
0F323456784E56EAB
|
||||
01AB3FED1347A5612
|
||||
0x234AABBCC34567C4
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
|
||||
|
||||
@item By fingerprint.
|
||||
This format is deduced from the length of the string and its content or
|
||||
the @code{0x} prefix. Note, that only the 20 byte version fingerprint
|
||||
is available with @command{gpgsm} (i.e. the SHA-1 hash of the
|
||||
certificate).
|
||||
|
||||
When using @command{gpg} an exclamation mark may be appended to force
|
||||
using the specified primary or secondary key and not to try and
|
||||
calculate which primary or secondary key to use.
|
||||
|
||||
The best way to specify a key Id is by using the fingerprint. This
|
||||
avoids any ambiguities in case that there are duplicated key IDs.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
1234343434343434C434343434343434
|
||||
123434343434343C3434343434343734349A3434
|
||||
0E12343434343434343434EAB3484343434343434
|
||||
0xE12343434343434343434EAB3484343434343434
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@noindent
|
||||
(@command{gpgsm} also accepts colons between each pair of hexadecimal
|
||||
digits because this is the de-facto standard on how to present X.509
|
||||
fingerprints.)
|
||||
|
||||
@item By exact match on OpenPGP user ID.
|
||||
This is denoted by a leading equal sign. It does not make sense for
|
||||
X.509 certificates.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
=Heinrich Heine <heinrichh@@uni-duesseldorf.de>
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@item By exact match on an email address.
|
||||
This is indicated by enclosing the email address in the usual way
|
||||
with left and right angles.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
<heinrichh@@uni-duesseldorf.de>
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
|
||||
@item By word match.
|
||||
All words must match exactly (not case sensitive) but can appear in any
|
||||
order in the user ID or a subjects name. Words are any sequences of
|
||||
letters, digits, the underscore and all characters with bit 7 set.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
+Heinrich Heine duesseldorf
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@item By exact match on the subject's DN.
|
||||
This is indicated by a leading slash, directly followed by the RFC-2253
|
||||
encoded DN of the subject. Note that you can't use the string printed
|
||||
by "gpgsm --list-keys" because that one as been reordered and modified
|
||||
for better readability; use --with-colons to print the raw (but standard
|
||||
escaped) RFC-2253 string
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
/CN=Heinrich Heine,O=Poets,L=Paris,C=FR
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@item By exact match on the issuer's DN.
|
||||
This is indicated by a leading hash mark, directly followed by a slash
|
||||
and then directly followed by the rfc2253 encoded DN of the issuer.
|
||||
This should return the Root cert of the issuer. See note above.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
#/CN=Root Cert,O=Poets,L=Paris,C=FR
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
|
||||
@item By exact match on serial number and issuer's DN.
|
||||
This is indicated by a hash mark, followed by the hexadecmal
|
||||
representation of the serial number, the followed by a slash and the
|
||||
RFC-2253 encoded DN of the issuer. See note above.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
#4F03/CN=Root Cert,O=Poets,L=Paris,C=FR
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@item By keygrip
|
||||
This is indicated by an ampersand followed by the 40 hex digits of a
|
||||
keygrip. @command{gpgsm} prints the keygrip when using the command
|
||||
@option{--dump-cert}. It does not yet work for OpenPGP keys.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
&D75F22C3F86E355877348498CDC92BD21010A480
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
|
||||
@item By substring match.
|
||||
This is the default mode but applications may want to explicitly
|
||||
indicate this by putting the asterisk in front. Match is not case
|
||||
sensitive.
|
||||
|
||||
@cartouche
|
||||
@example
|
||||
Heine
|
||||
*Heine
|
||||
@end example
|
||||
@end cartouche
|
||||
|
||||
@end itemize
|
||||
|
||||
|
||||
Please note that we have reused the hash mark identifier which was used
|
||||
in old GnuPG versions to indicate the so called local-id. It is not
|
||||
anymore used and there should be no conflict when used with X.509 stuff.
|
||||
|
||||
Using the RFC-2253 format of DNs has the drawback that it is not
|
||||
possible to map them back to the original encoding, however we don't
|
||||
have to do this because our key database stores this encoding as meta
|
||||
data.
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
/* The gnupg.org standard stylesheet. */
|
||||
@import url(/share/site.css);
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,3 +1,17 @@
|
|||
2006-12-04 Werner Koch <wk@g10code.com>
|
||||
|
||||
* filter.h (armor_filter_context_t): New field REFCOUNT.
|
||||
* armor.c (new_armor_context, release_armor_context)
|
||||
(push_armor_filter): New.
|
||||
(armor_filter): Call releae_armor_context for IOBUFCTRL_FREE.
|
||||
* import.c (import): Use the new function here instead of the
|
||||
old hack using the iobuf_push_filter2.
|
||||
* keyserver.c (keyserver_spawn): Ditto.
|
||||
|
||||
2006-12-03 Werner Koch <wk@g10code.com>
|
||||
|
||||
* keyedit.c (menu_clean): Made strings translatable.
|
||||
|
||||
2006-12-03 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyedit.c (menu_clean): Show "already minimized" rather than
|
||||
|
|
|
|||
53
g10/armor.c
53
g10/armor.c
|
|
@ -114,6 +114,58 @@ static char *tail_strings[] = {
|
|||
};
|
||||
|
||||
|
||||
/* Create a new context for armor filters. */
|
||||
armor_filter_context_t *
|
||||
new_armor_context (void)
|
||||
{
|
||||
armor_filter_context_t *afx;
|
||||
|
||||
afx = xcalloc (1, sizeof *afx);
|
||||
afx->refcount = 1;
|
||||
|
||||
return afx;
|
||||
}
|
||||
|
||||
/* Release an armor filter context. Passing NULL is explicitly
|
||||
allowed and a no-op. */
|
||||
void
|
||||
release_armor_context (armor_filter_context_t *afx)
|
||||
{
|
||||
if (!afx)
|
||||
return;
|
||||
|
||||
/* In contrast to 2.0, we use in 1.4 heap based contexts only in a
|
||||
very few places and in general keep the stack based contexts. A
|
||||
REFCOUNT of 0 indicates a stack based context and thus we don't
|
||||
do anything in this case. */
|
||||
if (!afx->refcount)
|
||||
return;
|
||||
|
||||
if ( --afx->refcount )
|
||||
return;
|
||||
xfree (afx);
|
||||
}
|
||||
|
||||
/* Push the armor filter onto the iobuf stream IOBUF. */
|
||||
int
|
||||
push_armor_filter (armor_filter_context_t *afx, iobuf_t iobuf)
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (!afx->refcount)
|
||||
return iobuf_push_filter (iobuf, armor_filter, afx);
|
||||
|
||||
afx->refcount++;
|
||||
rc = iobuf_push_filter (iobuf, armor_filter, afx);
|
||||
if (rc)
|
||||
afx->refcount--;
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static void
|
||||
initialize(void)
|
||||
{
|
||||
|
|
@ -1168,6 +1220,7 @@ armor_filter( void *opaque, int control,
|
|||
"probably a buggy MTA has been used\n") );
|
||||
xfree( afx->buffer );
|
||||
afx->buffer = NULL;
|
||||
release_armor_context (afx);
|
||||
}
|
||||
else if( control == IOBUFCTRL_DESC )
|
||||
*(char**)buf = "armor_filter";
|
||||
|
|
|
|||
|
|
@ -45,7 +45,27 @@ typedef struct {
|
|||
char defer[22];
|
||||
int defer_filled;
|
||||
int eof_seen;
|
||||
} decode_filter_ctx_t;
|
||||
int refcount;
|
||||
} *decode_filter_ctx_t;
|
||||
|
||||
|
||||
/* Helper to release the decode context. */
|
||||
static void
|
||||
release_dfx_context (decode_filter_ctx_t dfx)
|
||||
{
|
||||
if (!dfx)
|
||||
return;
|
||||
|
||||
assert (dfx->refcount);
|
||||
if ( !--dfx->refcount )
|
||||
{
|
||||
cipher_close (dfx->cipher_hd);
|
||||
dfx->cipher_hd = NULL;
|
||||
md_close (dfx->mdc_hash);
|
||||
dfx->mdc_hash = NULL;
|
||||
xfree (dfx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/****************
|
||||
|
|
@ -61,7 +81,10 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
unsigned blocksize;
|
||||
unsigned nprefix;
|
||||
|
||||
memset( &dfx, 0, sizeof dfx );
|
||||
|
||||
dfx = xcalloc (1, sizeof *dfx);
|
||||
dfx->refcount = 1;
|
||||
|
||||
if( opt.verbose && !dek->algo_info_printed ) {
|
||||
const char *s = cipher_algo_to_string( dek->algo );
|
||||
if( s )
|
||||
|
|
@ -80,15 +103,15 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
BUG();
|
||||
|
||||
if( ed->mdc_method ) {
|
||||
dfx.mdc_hash = md_open( ed->mdc_method, 0 );
|
||||
dfx->mdc_hash = md_open ( ed->mdc_method, 0 );
|
||||
if ( DBG_HASHING )
|
||||
md_start_debug(dfx.mdc_hash, "checkmdc");
|
||||
md_start_debug (dfx->mdc_hash, "checkmdc");
|
||||
}
|
||||
dfx.cipher_hd = cipher_open( dek->algo,
|
||||
ed->mdc_method? CIPHER_MODE_CFB
|
||||
: CIPHER_MODE_AUTO_CFB, 1 );
|
||||
dfx->cipher_hd = cipher_open ( dek->algo,
|
||||
ed->mdc_method? CIPHER_MODE_CFB
|
||||
: CIPHER_MODE_AUTO_CFB, 1 );
|
||||
/* log_hexdump( "thekey", dek->key, dek->keylen );*/
|
||||
rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen );
|
||||
rc = cipher_setkey ( dfx->cipher_hd, dek->key, dek->keylen );
|
||||
if( rc == G10ERR_WEAK_KEY )
|
||||
{
|
||||
log_info(_("WARNING: message was encrypted with"
|
||||
|
|
@ -106,7 +129,7 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
goto leave;
|
||||
}
|
||||
|
||||
cipher_setiv( dfx.cipher_hd, NULL, 0 );
|
||||
cipher_setiv ( dfx->cipher_hd, NULL, 0 );
|
||||
|
||||
if( ed->len ) {
|
||||
for(i=0; i < (nprefix+2) && ed->len; i++, ed->len-- ) {
|
||||
|
|
@ -123,8 +146,8 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
else
|
||||
temp[i] = c;
|
||||
}
|
||||
cipher_decrypt( dfx.cipher_hd, temp, temp, nprefix+2);
|
||||
cipher_sync( dfx.cipher_hd );
|
||||
cipher_decrypt ( dfx->cipher_hd, temp, temp, nprefix+2);
|
||||
cipher_sync ( dfx->cipher_hd );
|
||||
p = temp;
|
||||
/* log_hexdump( "prefix", temp, nprefix+2 ); */
|
||||
if(dek->symmetric
|
||||
|
|
@ -134,17 +157,18 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
goto leave;
|
||||
}
|
||||
|
||||
if( dfx.mdc_hash )
|
||||
md_write( dfx.mdc_hash, temp, nprefix+2 );
|
||||
if ( dfx->mdc_hash )
|
||||
md_write ( dfx->mdc_hash, temp, nprefix+2 );
|
||||
|
||||
if( ed->mdc_method )
|
||||
iobuf_push_filter( ed->buf, mdc_decode_filter, &dfx );
|
||||
dfx->refcount++;
|
||||
if ( ed->mdc_method )
|
||||
iobuf_push_filter( ed->buf, mdc_decode_filter, dfx );
|
||||
else
|
||||
iobuf_push_filter( ed->buf, decode_filter, &dfx );
|
||||
iobuf_push_filter( ed->buf, decode_filter, dfx );
|
||||
|
||||
proc_packets( procctx, ed->buf );
|
||||
ed->buf = NULL;
|
||||
if( ed->mdc_method && dfx.eof_seen == 2 )
|
||||
if( ed->mdc_method && dfx->eof_seen == 2 )
|
||||
rc = G10ERR_INVALID_PACKET;
|
||||
else if( ed->mdc_method ) { /* check the mdc */
|
||||
/* We used to let parse-packet.c handle the MDC packet but
|
||||
|
|
@ -162,24 +186,25 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||
that we know that 22 bytes are appended. */
|
||||
int datalen = md_digest_length( ed->mdc_method );
|
||||
|
||||
cipher_decrypt( dfx.cipher_hd, dfx.defer, dfx.defer, 22);
|
||||
md_write (dfx.mdc_hash, dfx.defer, 2);
|
||||
md_final( dfx.mdc_hash );
|
||||
if (dfx.defer[0] != '\xd3' || dfx.defer[1] != '\x14' ) {
|
||||
assert (dfx->cipher_hd);
|
||||
assert (dfx->mdc_hash);
|
||||
cipher_decrypt ( dfx->cipher_hd, dfx->defer, dfx->defer, 22);
|
||||
md_write ( dfx->mdc_hash, dfx->defer, 2);
|
||||
md_final ( dfx->mdc_hash );
|
||||
if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' ) {
|
||||
log_error("mdc_packet with invalid encoding\n");
|
||||
rc = G10ERR_INVALID_PACKET;
|
||||
}
|
||||
else if ( datalen != 20
|
||||
|| memcmp(md_read( dfx.mdc_hash, 0 ), dfx.defer+2, datalen) )
|
||||
|| memcmp(md_read( dfx->mdc_hash, 0 ), dfx->defer+2, datalen) )
|
||||
rc = G10ERR_BAD_SIGN;
|
||||
/*log_hexdump("MDC calculated:", md_read( dfx.mdc_hash, 0), datalen);*/
|
||||
/*log_hexdump("MDC message :", dfx.defer, 20);*/
|
||||
/*log_hexdump("MDC calculated:",md_read( dfx->mdc_hash, 0), datalen);*/
|
||||
/*log_hexdump("MDC message :", dfx->defer, 20);*/
|
||||
}
|
||||
|
||||
|
||||
leave:
|
||||
cipher_close(dfx.cipher_hd);
|
||||
md_close( dfx.mdc_hash );
|
||||
release_dfx_context (dfx);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -190,7 +215,7 @@ static int
|
|||
mdc_decode_filter( void *opaque, int control, IOBUF a,
|
||||
byte *buf, size_t *ret_len)
|
||||
{
|
||||
decode_filter_ctx_t *dfx = opaque;
|
||||
decode_filter_ctx_t dfx = opaque;
|
||||
size_t n, size = *ret_len;
|
||||
int rc = 0;
|
||||
int c;
|
||||
|
|
@ -245,8 +270,10 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
|
|||
}
|
||||
|
||||
if( n ) {
|
||||
cipher_decrypt( dfx->cipher_hd, buf, buf, n);
|
||||
md_write( dfx->mdc_hash, buf, n );
|
||||
if (dfx->cipher_hd)
|
||||
cipher_decrypt( dfx->cipher_hd, buf, buf, n);
|
||||
if (dfx->mdc_hash)
|
||||
md_write( dfx->mdc_hash, buf, n );
|
||||
}
|
||||
else {
|
||||
assert( dfx->eof_seen );
|
||||
|
|
@ -254,6 +281,9 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
|
|||
}
|
||||
*ret_len = n;
|
||||
}
|
||||
else if ( control == IOBUFCTRL_FREE ) {
|
||||
release_dfx_context (dfx);
|
||||
}
|
||||
else if( control == IOBUFCTRL_DESC ) {
|
||||
*(char**)buf = "mdc_decode_filter";
|
||||
}
|
||||
|
|
@ -263,7 +293,7 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
|
|||
static int
|
||||
decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
|
||||
{
|
||||
decode_filter_ctx_t *fc = opaque;
|
||||
decode_filter_ctx_t fc = opaque;
|
||||
size_t n, size = *ret_len;
|
||||
int rc = 0;
|
||||
|
||||
|
|
@ -271,12 +301,17 @@ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
|
|||
assert(a);
|
||||
n = iobuf_read( a, buf, size );
|
||||
if( n == -1 ) n = 0;
|
||||
if( n )
|
||||
cipher_decrypt( fc->cipher_hd, buf, buf, n);
|
||||
if( n ) {
|
||||
if (fc->cipher_hd)
|
||||
cipher_decrypt( fc->cipher_hd, buf, buf, n);
|
||||
}
|
||||
else
|
||||
rc = -1; /* eof */
|
||||
*ret_len = n;
|
||||
}
|
||||
else if ( control == IOBUFCTRL_FREE ) {
|
||||
release_dfx_context (fc);
|
||||
}
|
||||
else if( control == IOBUFCTRL_DESC ) {
|
||||
*(char**)buf = "decode_filter";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ typedef struct {
|
|||
} md_filter_context_t;
|
||||
|
||||
typedef struct {
|
||||
int refcount; /* Reference counter. If 0 this structure
|
||||
is not allocated on the heap. */
|
||||
|
||||
/* these fields may be initialized */
|
||||
int what; /* what kind of armor headers to write */
|
||||
int only_keyblocks; /* skip all headers but ".... key block" */
|
||||
|
|
@ -130,6 +133,9 @@ int md_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len);
|
|||
void free_md_filter_context( md_filter_context_t *mfx );
|
||||
|
||||
/*-- armor.c --*/
|
||||
armor_filter_context_t *new_armor_context (void);
|
||||
void release_armor_context (armor_filter_context_t *afx);
|
||||
int push_armor_filter (armor_filter_context_t *afx, IOBUF iobuf);
|
||||
int use_armor_filter( IOBUF a );
|
||||
int armor_filter( void *opaque, int control,
|
||||
IOBUF chain, byte *buf, size_t *ret_len);
|
||||
|
|
|
|||
|
|
@ -249,9 +249,10 @@ import( IOBUF inp, const char* fname,struct stats_s *stats,
|
|||
getkey_disable_caches();
|
||||
|
||||
if( !opt.no_armor ) { /* armored reading is not disabled */
|
||||
armor_filter_context_t *afx = xmalloc_clear( sizeof *afx );
|
||||
armor_filter_context_t *afx = new_armor_context ();
|
||||
afx->only_keyblocks = 1;
|
||||
iobuf_push_filter2( inp, armor_filter, afx, 1 );
|
||||
push_armor_filter (afx, inp);
|
||||
release_armor_context (afx);
|
||||
}
|
||||
|
||||
while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
|
||||
|
|
|
|||
|
|
@ -3232,25 +3232,25 @@ menu_clean(KBNODE keyblock,int self_only)
|
|||
else
|
||||
reason=_("invalid");
|
||||
|
||||
tty_printf("User ID \"%s\" compacted: %s\n",user,reason);
|
||||
tty_printf (_("User ID \"%s\" compacted: %s\n"), user, reason);
|
||||
|
||||
modified=1;
|
||||
}
|
||||
else if(sigs)
|
||||
{
|
||||
tty_printf(sigs==1?
|
||||
"User ID \"%s\": %d signature removed\n":
|
||||
"User ID \"%s\": %d signatures removed\n",
|
||||
user,sigs);
|
||||
tty_printf (sigs==1?
|
||||
_("User ID \"%s\": %d signature removed\n"):
|
||||
_("User ID \"%s\": %d signatures removed\n"),
|
||||
user,sigs);
|
||||
|
||||
modified=1;
|
||||
}
|
||||
else
|
||||
{
|
||||
tty_printf(self_only==1?
|
||||
"User ID \"%s\": already minimized\n":
|
||||
"User ID \"%s\": already clean\n",
|
||||
user);
|
||||
tty_printf (self_only==1?
|
||||
_("User ID \"%s\": already minimized\n"):
|
||||
_("User ID \"%s\": already clean\n"),
|
||||
user);
|
||||
}
|
||||
|
||||
xfree(user);
|
||||
|
|
|
|||
|
|
@ -1187,23 +1187,24 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
|
|||
|
||||
for(key=list;key!=NULL;key=key->next)
|
||||
{
|
||||
armor_filter_context_t afx;
|
||||
armor_filter_context_t *afx;
|
||||
IOBUF buffer=iobuf_temp();
|
||||
KBNODE block;
|
||||
|
||||
temp=NULL;
|
||||
add_to_strlist(&temp,key->d);
|
||||
|
||||
memset(&afx,0,sizeof(afx));
|
||||
afx.what=1;
|
||||
afx = new_armor_context ();
|
||||
afx->what = 1;
|
||||
/* Tell the armor filter to use Unix-style \n line
|
||||
endings, since we're going to fprintf this to a file
|
||||
that (on Win32) is open in text mode. The win32 stdio
|
||||
will transform the \n to \r\n and we'll end up with the
|
||||
proper line endings on win32. This is a no-op on
|
||||
Unix. */
|
||||
afx.eol[0]='\n';
|
||||
iobuf_push_filter(buffer,armor_filter,&afx);
|
||||
afx->eol[0]='\n';
|
||||
push_armor_filter (afx, buffer);
|
||||
release_armor_context (afx);
|
||||
|
||||
/* TODO: Remove Comment: lines from keys exported this
|
||||
way? */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2006-12-04 Werner Koch <wk@g10code.com>
|
||||
|
||||
* iobuf.h (iobuf_t): New. That is the name we use in 2.0.
|
||||
|
||||
2006-09-28 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* compat.h: Move strsep prototype and ascii_isspace macro to from
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#define IOBUFCTRL_USER 16
|
||||
|
||||
typedef struct iobuf_struct *IOBUF;
|
||||
typedef struct iobuf_struct *iobuf_t;
|
||||
|
||||
/* fixme: we should hide most of this stuff */
|
||||
struct iobuf_struct {
|
||||
|
|
|
|||
754
po/pt_BR.po
754
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
742
po/zh_CN.po
742
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
742
po/zh_TW.po
742
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
|
|
@ -1,3 +1,7 @@
|
|||
2006-12-04 Werner Koch <wk@g10code.com>
|
||||
|
||||
* mk-gpg-texi: Removed.
|
||||
|
||||
2006-10-02 Werner Koch <wk@g10code.com>
|
||||
|
||||
* w32installer.nsi: Don't uninstall winpt if the installer comes
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ mkdiff
|
|||
build-w32
|
||||
gnupg.spec.in
|
||||
autogen.sh
|
||||
mk-gpg-texi
|
||||
mk-w32-dist
|
||||
w32installer.nsi
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,133 @@
|
|||
#!/bin/sh
|
||||
# Get modification time of a file or directory and pretty-print it.
|
||||
# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
|
||||
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
|
||||
#
|
||||
# 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,
|
||||
# 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.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# Prevent date giving response in another language.
|
||||
LANG=C
|
||||
export LANG
|
||||
LC_ALL=C
|
||||
export LC_ALL
|
||||
LC_TIME=C
|
||||
export LC_TIME
|
||||
|
||||
save_arg1="$1"
|
||||
|
||||
# Find out how to get the extended ls output of a file or directory.
|
||||
if ls -L /dev/null 1>/dev/null 2>&1; then
|
||||
ls_command='ls -L -l -d'
|
||||
else
|
||||
ls_command='ls -l -d'
|
||||
fi
|
||||
|
||||
# A `ls -l' line looks as follows on OS/2.
|
||||
# drwxrwx--- 0 Aug 11 2001 foo
|
||||
# This differs from Unix, which adds ownership information.
|
||||
# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
|
||||
#
|
||||
# To find the date, we split the line on spaces and iterate on words
|
||||
# until we find a month. This cannot work with files whose owner is a
|
||||
# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
|
||||
# will be owned by a user whose name is a month. So we first look at
|
||||
# the extended ls output of the root directory to decide how many
|
||||
# words should be skipped to get the date.
|
||||
|
||||
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
|
||||
set - x`$ls_command /`
|
||||
|
||||
# Find which argument is the month.
|
||||
month=
|
||||
command=
|
||||
until test $month
|
||||
do
|
||||
shift
|
||||
# Add another shift to the command.
|
||||
command="$command shift;"
|
||||
case $1 in
|
||||
Jan) month=January; nummonth=1;;
|
||||
Feb) month=February; nummonth=2;;
|
||||
Mar) month=March; nummonth=3;;
|
||||
Apr) month=April; nummonth=4;;
|
||||
May) month=May; nummonth=5;;
|
||||
Jun) month=June; nummonth=6;;
|
||||
Jul) month=July; nummonth=7;;
|
||||
Aug) month=August; nummonth=8;;
|
||||
Sep) month=September; nummonth=9;;
|
||||
Oct) month=October; nummonth=10;;
|
||||
Nov) month=November; nummonth=11;;
|
||||
Dec) month=December; nummonth=12;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Get the extended ls output of the file or directory.
|
||||
set - x`eval "$ls_command \"\$save_arg1\""`
|
||||
|
||||
# Remove all preceding arguments
|
||||
eval $command
|
||||
|
||||
# Get the month. Next argument is day, followed by the year or time.
|
||||
case $1 in
|
||||
Jan) month=January; nummonth=1;;
|
||||
Feb) month=February; nummonth=2;;
|
||||
Mar) month=March; nummonth=3;;
|
||||
Apr) month=April; nummonth=4;;
|
||||
May) month=May; nummonth=5;;
|
||||
Jun) month=June; nummonth=6;;
|
||||
Jul) month=July; nummonth=7;;
|
||||
Aug) month=August; nummonth=8;;
|
||||
Sep) month=September; nummonth=9;;
|
||||
Oct) month=October; nummonth=10;;
|
||||
Nov) month=November; nummonth=11;;
|
||||
Dec) month=December; nummonth=12;;
|
||||
esac
|
||||
|
||||
day=$2
|
||||
|
||||
# Here we have to deal with the problem that the ls output gives either
|
||||
# the time of day or the year.
|
||||
case $3 in
|
||||
*:*) set `date`; eval year=\$$#
|
||||
case $2 in
|
||||
Jan) nummonthtod=1;;
|
||||
Feb) nummonthtod=2;;
|
||||
Mar) nummonthtod=3;;
|
||||
Apr) nummonthtod=4;;
|
||||
May) nummonthtod=5;;
|
||||
Jun) nummonthtod=6;;
|
||||
Jul) nummonthtod=7;;
|
||||
Aug) nummonthtod=8;;
|
||||
Sep) nummonthtod=9;;
|
||||
Oct) nummonthtod=10;;
|
||||
Nov) nummonthtod=11;;
|
||||
Dec) nummonthtod=12;;
|
||||
esac
|
||||
# For the first six month of the year the time notation can also
|
||||
# be used for files modified in the last year.
|
||||
if (expr $nummonth \> $nummonthtod) > /dev/null;
|
||||
then
|
||||
year=`expr $year - 1`
|
||||
fi;;
|
||||
*) year=$3;;
|
||||
esac
|
||||
|
||||
# The result.
|
||||
echo $day $month $year
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Helper to create the texinfo versions from gpg.sgml
|
||||
#
|
||||
# Copyright (C) 2002, 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
|
||||
# modifications, as long as this notice is preserved.
|
||||
#
|
||||
# This program 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.
|
||||
|
||||
set -e
|
||||
|
||||
for file in gpg gpgv; do
|
||||
sgml2xml -x lower ${file}.sgml >${file}.xml
|
||||
# docbook2texi ${file}.xml | sed 's,--,---,' | (
|
||||
docbook2x-texi --to-stdout ${file}.xml | \
|
||||
sed '/^@setfilename/,/^@end direntry/d' | (
|
||||
case "$file" in
|
||||
*gpgv)
|
||||
sed '/\\input texinfo/a \
|
||||
@setfilename gpgv.info\
|
||||
@dircategory GnuPG\
|
||||
@direntry\
|
||||
* gpgv: (gpgv). GnuPG signature verification tool.\
|
||||
@end direntry
|
||||
'
|
||||
;;
|
||||
|
||||
gpg)
|
||||
sed '/\\input texinfo/a \
|
||||
@setfilename gpg.info\
|
||||
@dircategory GnuPG\
|
||||
@direntry\
|
||||
* gpg: (gpg). GnuPG encryption and signing tool.\
|
||||
@end direntry
|
||||
'
|
||||
;;
|
||||
|
||||
*)
|
||||
cat
|
||||
;;
|
||||
esac
|
||||
) >${file}.texi
|
||||
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue