Update to upstream version '1.38'
with Debian dir 48923f5e3df2ed059bdcfa72b171c4a48dd17b8e

--

* src/syscfg/lock-obj-pub.mips64-unknown-linux-gnuabi64.h: new.
* src/Makefile.am (lock_obj_pub): Add it.

--
This information was dervied and reported by YunQiang Su
<syq@debian.org>.

GnuPG-bug-id: 4952
Debian-bug-id: 960161
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

* configure.ac (HAVE_GENERATED_LOCK_OBJ_H): New.
* src/Makefile.am: Support HAVE_GENERATED_LOCK_OBJ_H.

--

For cross build, when possible (currently for GNU/Linux),
generate lock-obj-pub.native.h by the script.

GnuPG-bug-id: 4774
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

* src/gen-lock-obj.sh: New.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

* src/argparse.c (handle_meta_echo): Substitue some vars.
(handle_meta_user): Factor some code out to ...
(assure_username): new.
--

Yeah, that is not really needed but might sometimes be helpful.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (initialize): Clear username.
* src/sysutils.c (_gpgrt_getusername): Implement for Windows.
--

This also fixes a missing intialization

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/sysutils.c (_gpgrt_getusername): New.
* src/argparse.c (struct _gpgrt_argparse_internal_s): New flags user_*
and store the current user.
(initialize): Free new malloced field.  Clear new flags.
(handle_meta_user): Implement.
(handle_metacmd): Implement user sections.  Remove "group" meta
command.
(_gpgrt_argparse): Implement user sections.
(finish_read_sys): Reset new vars.
--

Implementing group would be somewhat complicated and it is doubtful
whether this really makes sense and is manageable for the admin.

Note that we have not yet implemented this for Windows.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (show_help): Do not print empty sections between
headers.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.h.in (ARGPARSE_OPT_HEADER): New.
(ARGPARSE_OPT_VERBATIM): New.
(ARGPARSE_verbatim): New.
(ARGPARSE_header): New.
* src/argparse.c (show_help): Implement them.
--

These two macros are useful for custom help screens.  In contrast to
the ARGPARSE_group hack they do not need a short option number (we use
1 here as a surrogate) and not the "@" hack.  Thus already translated
strings can be used.  ARGPARSE_header further allows to specify a
symbolic name for the group and does some minor formatting.  If such a
symbolic name is given --dump-option-table also emits this as a pseudo
option for consumption by GUIs which for example use tabs to group
options.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/init.c (_gpgrt_reallocarray): New.
* src/visibility.c (gpgrt_reallocarray): New.
* src/gpg-error.vers, src/gpg-error.def.in: Add new function.
* src/gpg-error.h.in: Add new interface.
* tests/t-malloc.c: New.
* tests/Makefile.am (TESTS): Add new test.
--

Note that this function is different from the glibc function because
it has an extra parameter which allows to clear the new elements.  A
realloc after a calloc with forgotten memset after it is a common
source of error, thus we introduce this slightly different function.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (initialize): Increase number of extra slots.
--

I should really buy the valgrind authors a beer.

Fixes-commit: db95feab


Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (initialize): Add new internal option.
(arg_parse): Implement that option.
(dump_option_table): New.
(show_help): Remove exit and let the caller call my_exit.
--

This options allows us to get a copy of the option table.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (writestrings): Use that function to match what we
are doing in flushstrings.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.h.in (ARGPARSE_FLAG_WITHATTR): New.
(ARGPARSE_ATTR_FORCE): New.
(ARGPARSE_ATTR_IGNORE): New.
(ARGPARSE_TYPE_MASK): Moved from argparse.c to here.
* src/argparse.c: Always use macros for constants.
(_gpgrt_argparse): Handle ARGPARSE_FLAG_WITHATTR.
(arg_parse): Ditto.
* tests/t-argparse.c (main): Add commented test case.
--

This is a ABI compatible hack to allow the ignore and force attributes
as well as to return which option has been ignored in a user file or
on the command line.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (opttable_t): Add new flags forced, ignore, and
explicit_ignore.
(struct _gpgrt_argparse_internal_s): Change flags to bitflags.  Add
several flags to support meta commands.
(initialize): Clear them.
(handle_meta_user): Use the new verbose flag.
(handle_meta_force): Implement.
(handle_meta_ignore): Implement.
(handle_meta_echo): Support "-echo".
(handle_meta_verbose): New.
(handle_metacmd): New meta command verbose.  Add always flag and move
the detection of unexpected meta commands to here.
(_gpgrt_argparse): Make use of the ignore and forced meta commands.
(finish_read_sys): New.
(_gpgrt_argparser): Support the verbose flag.  Call finish_read_sys.
(arg_parse): Ignore non-explicit ignored and all forced options.

* tests/t-argparse.c (main): Fix printing of the ARGPARSE_CONFFILE
case.  New option 'M'.
* tests/t-argparse.conf, tests/etc/t-argparse.conf: Various changes to
test the new meta commands.
--

For the command line we print a diagnostic if an ignored or forced
options is used.  However, we do not ignore options which are only set
via [ignore-all].  The rationale for the latter is that an
administrator can't be be required to unignore all options used by all
modes, of say gpgme.

Documentation of the meta commands will for now be added to GnuPG.

GnuPG-bug-id: 4788
Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (arg_parse): Fix it here.

* src/argparse.c (handle_meta_user): New stub.
(handle_meta_force): New stub.
(handle_meta_ignore): New stub.
(handle_meta_echo): New.
(handle_metacmd): New.
(_gpgrt_argparse): Call meta command handler.
--

GnuPG-bug-id: 4788
Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (opttable_t): New.
(struct _gpgrt_argparse_internal_s): Use this instead of a ppointer to
gpgrt_opt_t.
(initialize): Copy options to the new tableand keep an original ordinal.
(_gpgrt_argparse): Adjust for changes.
(any_opt_conffile): Ditto.
(find_long_option): Ditto.
(arg_parse): Ditto.
(long_opt_strlen): Adjust args.
(cmp_ordtbl): New.
(show_help): Print using the ordinal numbers.
--

We will need to keep extra information along with the options.  This
changes prepares this by using a copy of the user provided option
table.  The only new info is the original ordinal number which will
allow us to eventually do a binary search on the options but still be
able to print the help in the user defined way.

GnuPG-bug-id: 4788
Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.h.in (ARGPARSE_INVALID_META): New
(ARGPARSE_UNKNOWN_META, ARGPARSE_UNEXPECTED_META): New.
* src/argparse.c (struct _gpgrt_argparse_internal_s): Add flag
insysconfig.
(initialize): Init flag.  Add error strings.
(_gpgrt_argparser): Set that flag.
(_gpgrt_argparse): Add parsing of meta commands.

* tests/etc/t-argparse.conf: Add some test cases.
* tests/t-argparse.conf: Ditto.
* tests/t-argparse.c (main): Die only after printing all warnings.
--

Noe that this is just the framework to add meta commands to the global
config file.  We also need to get away from fixes test config files
and create them on the fly to that we are able to test also errors.

GnuPG-bug-id: 4788

* src/argparse.c (_gpgrt_argparse): Fold common code.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/argparse.c (_gpgrt_argparse): Use enum for the states and
replace continue and break.
--

The use of continue and break in the endless loop if confusing due to
the size of the loop's body and because there are also inner for
loops with break.  It is better to make things explicit by using goto.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.h.in (ARGPARSE_FLAG_USERVERS): New.
* src/argparse.c: Include unistd.h.
(try_versioned_conffile): New.
(_gpgrt_argparser): Use it.
--

This is neded to bring the versioned config files back to gpg.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.h.in (ARGPARSE_PERMISSION_ERROR): New.
* src/argparse.c (initialize): Add code to print this error.
--

We need this option to reject certain config files if we detect a
permission problem.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/gpg-error.def.in (gpgrt_argparser): Fix typo.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>