1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-31 22:18:03 +02:00

use minimal posix sed

This commit is contained in:
Werner Koch 2006-04-12 10:36:23 +00:00
parent 8df71cf868
commit b2f4b15b7c
4 changed files with 20 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2006-04-12 Werner Koch <wk@g10code.com>
* configure.ac: Print version at end of run.
(svn_revision): Posix adjustment.
2006-04-07 Werner Koch <wk@g10code.com> 2006-04-07 Werner Koch <wk@g10code.com>
* configure.ac: Use new method to include the SVN revison. Now it * configure.ac: Use new method to include the SVN revison. Now it

View File

@ -31,7 +31,7 @@ m4_define([my_version], [1.4.4])
m4_define([my_issvn], [yes]) m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \ m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q}')])) || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]), AC_INIT([gnupg], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
[bug-gnupg@gnu.org]) [bug-gnupg@gnu.org])
# Set development_version to yes if the minor number is odd or you # Set development_version to yes if the minor number is odd or you
@ -1407,6 +1407,7 @@ AC_OUTPUT
# Give some feedback # Give some feedback
echo echo
echo " Version info: $PACKAGE_STRING"
echo " Configured for: $PRINTABLE_OS_NAME ($host)" echo " Configured for: $PRINTABLE_OS_NAME ($host)"
if test -n "$show_extraasm"; then if test -n "$show_extraasm"; then
echo " Extra cpu specific functions:$show_extraasm" echo " Extra cpu specific functions:$show_extraasm"

View File

@ -1,3 +1,7 @@
2006-04-11 Michael Roth <mroth@nessie.de> (wk)
* gpg.sgml (passphrase-fd): Explain that only the first line is used.
2006-04-09 David Shaw <dshaw@jabberwocky.com> 2006-04-09 David Shaw <dshaw@jabberwocky.com>
* gpg.sgml: Some typo fixes. This is Debian 361324. * gpg.sgml: Some typo fixes. This is Debian 361324.

View File

@ -2340,18 +2340,20 @@ Enabled by default. --no-escape-from-lines disables this option.
<varlistentry> <varlistentry>
<term>--passphrase-fd &ParmN;</term> <term>--passphrase-fd &ParmN;</term>
<listitem><para> <listitem><para>
Read the passphrase from file descriptor &ParmN;. If you use 0 for Read the passphrase from file descriptor &ParmN;. Only the first line
&ParmN;, the passphrase will be read from stdin. This can only be will be read from file descriptor &ParmN;. If you use 0 for &ParmN;,
used if only one passphrase is supplied. the passphrase will be read from stdin. This can only be used if only
one passphrase is supplied.
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry> <varlistentry>
<term>--passphrase-file &ParmFile;</term> <term>--passphrase-file &ParmFile;</term>
<listitem><para> <listitem><para>
Read the passphrase from file &ParmFile;. This can only be used if Read the passphrase from file &ParmFile;. Only the first line will
only one passphrase is supplied. Obviously, a passphrase stored in a be read from file &ParmFile;. This can only be used if only one
file is of questionable security if other users can read this file. passphrase is supplied. Obviously, a passphrase stored in a file is
Don't use this option if you can avoid it. of questionable security if other users can read this file. Don't use
this option if you can avoid it.
</para></listitem></varlistentry> </para></listitem></varlistentry>
<varlistentry> <varlistentry>