aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* core: New API gpgrt_cmp_versionWerner Koch2018-11-1510-34/+275
| | | | | | | | | | | | | | | | | | | | | * src/gpg-error.h.in: New API gpgrt_cmp_version. * src/visibility.c (gpgrt_cmp_version): New wrapper. * src/version.c (parse_version_string): Revamped. (do_cmp_version): New. (_gpgrt_cmp_version): New. (_gpg_error_check_version): Re-implemented using the new func. * tests/t-version.c: Include t-common.h. (t_gpgrt_cmp_version): New test. (main): Run new test. Change test for new version number to require a 2 level number. -- We have implementations of very similar functions in all out libs. Thus it makes sense to provide a generic version. This version is actually derived from the ftp-indexer.c we use for the gnupg website (see the gnupg-doc repo). Signed-off-by: Werner Koch <[email protected]>
* gpgrt-config: Prepend PKG_CONFIG_LIBDIR to PKG_CONFIG_PATH.NIIBE Yutaka2018-11-141-8/+23
| | | | | | | | | | | * src/gpgrt-config: Handle empty PKG_CONFIG_LIBDIR config, which should ignore --libdir option. Otherwise, prepend PKG_CONFIG_LIBDIR (instead of appending) to PKG_CONFIG_PATH. -- Suggested-by: Andre Heinecke <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix typo in the annotation.NIIBE Yutaka2018-11-131-1/+1
| | | | | | * src/init.c [DLL_EXPORT] (DllMain): Fix typo. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgrt.m4: Don't support --with-*-prefix or SYSROOT.NIIBE Yutaka2018-11-131-52/+4
| | | | | | | | | | | | | * src/gpgrt.m4: Remove old backward compatible support. -- Since this macro gpgrt.m4 has not yet been used by any, we can break now. The gpgrt-config script is for all hosts (switching by --libdir option), it's not switched by --with-*-prefix nor SYSROOT. Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix a typo.NIIBE Yutaka2018-11-071-1/+1
| | | | | | * src/spawn-w32.c (src/spawn-w32.c): Fix to use pid_to_handle. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgrt-config: Don't support variable reference in --libdir option.NIIBE Yutaka2018-11-023-44/+36
| | | | | | | | | | | | | | | | | * src/gpgrt-config: Simplify --libdir support, remove variable substituion. * src/gpg-error.m4: Expand possible ${prefix}, ${exec_prefix} in libdir. Simplify invocation of gpgrt-config. * src/gpgrt.m4: Likewise. -- The --libdir option for configure can include variable reference like --libdir='${exec_prefix}/lib/x86_64-linux-gnu', and this expression should be expanded (the variable should be substituted) beforehand to determine if there is gpg-error.pc file or not. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error.m4: Emit message when using gpgrt-config.NIIBE Yutaka2018-11-021-0/+2
| | | | | | * src/gpg-error.m4: Add AC_MSG_NOTICE. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error.m4: Find gpgrt_libdir by CC.NIIBE Yutaka2018-11-022-18/+44
| | | | | | | | | | | | | | * src/gpg-error.m4 (gpgrt_libdir): New. Bump the version date. * src/gpgrt.m4: Likewise. -- Locating gpg-error.pc file, when it's not found at target's $libdir, try system libdir defined by CC, assuming CC supports gcc compatible -print-file-name option. GnuPG-bug-id: 4239 Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work.NIIBE Yutaka2018-11-011-2/+8
| | | | | | * src/gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgrt-config: It's distributed script.NIIBE Yutaka2018-11-011-1/+2
| | | | | | | | | | | | * src/Makefile.am (dist_bin_SCRIPTS): Add gpgrt-config. (bin_SCRIPTS): Remove gpgrt-config. -- This is the automake thing; Since gpgrt-config is not generated script, we should use dist_bin_SCRIPTS here. Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Remove cruft in w32-estream from olden times.Andre Heinecke2018-10-311-28/+0
| | | | | | | | | | | | | * src/w32-io.c (set_synchronize): Remove. (create_reader, create_writer): No need for set_synchronize. -- The set_synchronize dates back to 2001 at a time when gpgme got the Windows support on WindowsME and Windows2000. Maybe this was required then due to bugs in that old NT or partly NT based Windows versions. Removal similar to the removal in gpgme's w32-io.
* gpgrt-config: Fix typo in the script.NIIBE Yutaka2018-10-311-1/+1
| | | | | | * src/gpgrt-config: Add missing $ for libdir_option. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgrt-config: Better architecture independent support.NIIBE Yutaka2018-10-296-106/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac: Don't generate gpgrt-config. * src/gpgrt-config: Rename from gpgrt-config.in. (--prefix, --exec-prefix, --libdir): Use --libdir to determine PKG_CONFIG_LIBDIR. * src/Makefile.am (EXTRA_DIST): Remove gpgrt-config.in. * src/gpg-error-config-test.sh: Fix for path to gpgrt-config. * src/gpg-error.m4: Provide --prefix, --exec-prefix, --libdir option from configure. Don't use CC because we have --libdir. Bump version date. * src/gpgrt.m4: Likewise. -- Considering multilib support as well as multiarch support, it is better to provide the information for PKG_CONFIG_LIBDIR by --libdir directly, instead of CC. Difficulty is that configure allows variable reference like: --libdir='${exec_prefix}/i386-linux' So, it should also support --prefix and --exec_prefix options. Signed-off-by: NIIBE Yutaka <[email protected]>
* b64dec: Fix to use custom memory handlers.Ben Kibbey2018-10-271-2/+2
| | | | | | * src/b64dec.c (_gpgrt_b64dec_finish): Use xfree(). Signed-off-by: Ben Kibbey <[email protected]>
* gpgrt-config: Clean up the implementation.NIIBE Yutaka2018-10-261-25/+38
| | | | | | | | | | | * src/gpgrt-config.in: Fix copyright notice. (--exists): Support new option of pkg-config. (--mt): Relax usage. (--api-version): Support old option. (default_module): New. (usage): Only show pkg-config compatible options. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error.m4: Better backward compatibility support.NIIBE Yutaka2018-10-261-7/+20
| | | | | | | * src/gpg-error.m4: Don't assume newer implementation of gpg-error-config. Use old way when it found old. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Keep old gpg-error-config implementation.NIIBE Yutaka2018-10-254-25/+20
| | | | | | | | | | | | | | | | | * configure.ac: Generate gpgrt-config from gpgrt-config.in. * src/gpgrt-config.in: Rename from src/gpg-error-config-new.in. * src/Makefile.am (bin_SCRIPTS): Add gpgrt-config. (EXTRA_DIST): Add gpgrt-config.in removing gpg-error-config-new.in. (BUILT_SOURCES, CLEANFILES): Remove gpgrt-config. (gpg-error-config): Always copy from gpg-error-config-old. * src/gpg-error-config-test.sh: Follow the rename. -- The gpgrt-config script is new implementation supporting *.pc file, while gpg-error-config keeps old single shell script. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Set GPGRT_CONFIG in gpg-error.m4.NIIBE Yutaka2018-10-251-4/+17
| | | | | | | | | | | * src/gpg-error.m4: Detect gpgrt-config to set GPGRT_CONFIG. -- Set GPGRT_CONFIG when there is no gpg-error-config or gpg-error-config reports version >= 1.33. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Update gpg-error.m4 and gpgrt.m4.NIIBE Yutaka2018-10-252-29/+35
| | | | | | | | | | | | | * src/gpg-error.m4: Bump version date. (min_gpg_error_version): Require >= 1.33, if not specified. (gpg_error_config_args): Remove bogus uses. * src/gpgrt.m4: Bump version date. (libgpgrt-prefix): Add support of --with-libgpgrt-prefix option. (gpgrt-config): Search/call gpgrt-config instead of gpg-error-config. (min_gpgrt_version): Require >= 1.33, if not specified. (gpgrt_config_args): Remove bogus uses. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Fix previous commit.NIIBE Yutaka2018-10-241-2/+1
| | | | Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Old gpg-error-config support --modversion.NIIBE Yutaka2018-10-241-0/+1
| | | | | | * src/gpg-error-config.in: Support --modversion. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Get var/attr from the first package.NIIBE Yutaka2018-10-241-2/+5
| | | | | | * src/gpg-error-config-new.in: Only get it from the first. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Fix permission.NIIBE Yutaka2018-10-232-0/+0
| | | | | | | | | | | | * build-aux/config.guess: Chmod +x. * build-aux/config.sub: Chmod +x. -- Downloading the file directly, file permission was changed. Fixes-commit: 6d2e0546d50a0d4511fb7167566bfd0058a68f38 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Fix detecting build on multiarch environment.NIIBE Yutaka2018-10-231-7/+10
| | | | | | | | | | | * configure.ac: Rough match by shell pattern. -- Since libdir is i386-linux-gnu on Debian i686-linux-gnu machine, exact match to host_alias didn't work. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Supply CC to invoke gpg-error-config.NIIBE Yutaka2018-10-232-12/+14
| | | | | | | | | | | | * src/gpg-error.m4: Add CC when invoking gpg-error-config. * src/gpgrt.m4: Likewise. -- For standard cross build, the use of --with-libgpg-error-prefix will not be needed, as the script automatically finds the place. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Fix cross build support.NIIBE Yutaka2018-10-232-8/+35
| | | | | | | | | | | | * configure.ac: Fix regexp matching multiarch environment. * src/gpg-error-config-new.in: Support standard cross build. Handle the case where $multiarch != $triplet. -- For standard cross build, use @exec_prefix@/$triplet/lib/pkgconfig. Signed-off-by: NIIBE Yutaka <[email protected]>
* yat2m: Avoid compiler warnings.NIIBE Yutaka2018-10-221-1/+1
| | | | | | * doc/yat2m.c (isodatestring): Prepare enough buffer. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Support "auto", architecture independent script.NIIBE Yutaka2018-10-222-1/+20
| | | | | | | | | | | | | * configure.ac (pkg_config_libdir): Set it "auto" when it looks multiarch environment. * src/gpg-error-config-new.in: Automatically detects the triplet. -- The triplet detection mechanism is not sufficient. It's up to distributions to apply more changes (in distribution specific way). Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Update config.{guess,sub} to {2018-08-29,2018-08-29}.NIIBE Yutaka2018-10-222-1591/+1588
| | | | | | | | | | | | | * build-aux/config.guess: Update. * build-aux/config.sub: Update. -- Local changes of timestamp may result merge conflict when we update those files from upstream. It's good to merge now than later. Fixes-commit: e99480affa595702595e59333aca96ab28389d34 Signed-off-by: NIIBE Yutaka <[email protected]>
* build-aux: use https instead of httpDaniel Kahn Gillmor2018-10-192-8/+8
| | | | Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* gpg-error-config: Fix PKG_CONFIG_LIBDIR support.NIIBE Yutaka2018-10-172-2/+4
| | | | | | | | | | | | * configure.ac (pkg_config_libdir): New. * src/gpg-error-config-new.in: Use pkg_config_libdir. -- PKG_CONFIG_LIBDIR is not mere libdir but should include 'pkgconfig'. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Support PKG_CONFIG_LIBDIR.NIIBE Yutaka2018-10-161-1/+1
| | | | | | | | | | | | * src/gpg-error-config-new.in: Use PKG_CONFIG_LIBDIR if specified. -- This change allows a distribution (like Debian) offering <triplet>-gpg-error-config wrapper script which invokes gpg-error-config with host specific PKG_CONFIG_LIBDIR. Signed-off-by: NIIBE Yutaka <[email protected]>
* syscfg: Add support for arm64ilp32Wookey2018-10-122-0/+25
| | | | | | | | | | | * src/syscfg/lock-obj-pub.aarch64-unknown-linux-gnu_ilp32.h: New. * src/Makefile.am (lock_obj_pub): Add it. -- Debian-bug-id: 869605 Co-authored-by: Wookey <[email protected]> Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* gpg-error-config: Fix the place of *.pc (for multilib).NIIBE Yutaka2018-10-102-4/+4
| | | | | | | | | | * src/Makefile.am (pkgconfigdir): It should be under libdir. * src/gpg-error-config-new.in: Likewise. -- Reported-by: Alon Bar-Lev <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Add PKG_CONFIG_SYSROOT_DIR support.NIIBE Yutaka2018-10-102-2/+34
| | | | | | | | | | | | * src/gpg-error-config-new.in (sysroot): New function. (want_cflags, want_libs): Use sysroot. * src/gpg-error-config-test.sh: Test with PKG_CONFIG_SYSROOT_DIR. -- PKG_CONFIG_SYSROOT_DIR is for cross build. Signed-off-by: NIIBE Yutaka <[email protected]>
* syscfg: Add support for arc-unknown-linux-gnuWerner Koch2018-09-211-1/+2
| | | | | | | | | | * src/mkheader.c (canon_host_triplet): Add to table. -- Note that unknown in the above triplet is actually a wildcard for 4 part triplets. Signed-off-by: Werner Koch <[email protected]>
* core: Make cross building in mkheader more explicit.Werner Koch2018-09-212-2/+15
| | | | | | | | | | | | | | | | | * src/mkheader.c (main): Add option --cross. (write_special): Don't use native in cross mode. * src/Makefile.am (mkheader_opts): New. (gpg-error.h): Add MKHEADER_OPTS. -- The old behaviour was that an existing lock-obj-oub.native.h was preferred over one from syscfg even in cross mode. The Makefile tried to get this right by deleting such a file first but when calling mkheader manually for testing this may have not been done. We now allow (and also use by the Makefile) an option --cross to make this explicit. Signed-off-by: Werner Koch <[email protected]>
* core: Simplify calling convention of mkheader.Werner Koch2018-09-212-26/+41
| | | | | | | | | | | | * src/Makefile.am (gpg-error.h): Remove HOST_OS from mkheader call. * src/mkheader.c (canon_host_triplet): Add return arg r_os. (main): Remove first arg and derive host_os from host_triplet. -- No need to let the caller pass the host_os, we can derive it from the triplet. Signed-off-by: Werner Koch <[email protected]>
* src: Fix portability for echo.NIIBE Yutaka2018-09-201-1/+1
| | | | | | * src/Makefile.am: Use ECHO_N and ECHO_C. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Remove white space for the output by old.NIIBE Yutaka2018-09-201-8/+8
| | | | | | | | | * src/gpg-error-config-test.sh: Remove white spaces at the end or at the beginning. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Use expr to remove var in expression.NIIBE Yutaka2018-09-201-1/+1
| | | | | | | | | | | * src/gpg-error-config-new.in (remove_var_expr): Use expr. -- For OpenBSD's sh, it results "bad substitusion". Now, we use expr. Tested on OpenBSD 6.2. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Fix a variable name for zsh.NIIBE Yutaka2018-09-201-7/+7
| | | | | | | | | | * src/gpg-error-config-new.in (module_list): Rename from modules. -- For ZSH, "modules" is built-in variable name. Avoid such a use. Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Don't use local variables.NIIBE Yutaka2018-09-201-136/+137
| | | | | | | | | | | | * src/gpg-error-config-new.in: Use global variables only. -- Since Korn Shell requires different syntax for function to declare local variables, and some OS use Korn Shell as /bin/sh, avoid non-portable use of "local". Signed-off-by: NIIBE Yutaka <[email protected]>
* gpg-error-config: Avoid more space char.NIIBE Yutaka2018-09-201-5/+5
| | | | | | * src/gpg-error-config-new.in: Don't put more space. Signed-off-by: NIIBE Yutaka <[email protected]>
* src: Fix Makefile for BSD make.NIIBE Yutaka2018-09-191-3/+6
| | | | | | | | | | | | | | * src/Makefile.am (BUILT_SOURCES): Add srcdir to err-sources.h and err-codes.h. (CLEANFILES): Move err-sources.h and err-codes.h to... (MAINTAINERCLEANFILES): ... this new target. (gpg_error_LDADD): Remove ./ to generate libgpg-error.la. -- BSD make is not kind enough to mix path and target. Signed-off-by: NIIBE Yutaka <[email protected]>
* Accept pkgconf difference for spaces.NIIBE Yutaka2018-09-191-3/+3
| | | | | | | | | | | | | | * src/gpg-error-config-test.sh (OUTPUT_OLD): Use shell and echo to remove spaces. -- There is an alternative implementation of pkg-conf, named pkgconf. It emits an extra space at the end. Tested on FreeBSD 11.1. Signed-off-by: NIIBE Yutaka <[email protected]>
* syscfg: Support ARC CPUs and simplify aliasing table.Werner Koch2018-09-1810-23/+85
| | | | | | | | | | | | | | | | | | | * src/mkheader.c (xmalloc): New. (xstrdup): Implement using xmalloc. (canon_host_triplet): Add supporr for arc CPU. Adjust alias table to also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add unknown vendor hack. (main): New mode to just print the canonicalized form. * src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename files accordingly. -- config.sub does no real aliasing and thus we would need to add several vendors to the alising tables despite that this has no technical meanding. Instead we now replace the vendor with "unknown" for the 4-part-"triplets". This change will make maintenace easier. Signed-off-by: Werner Koch <[email protected]>
* Make gpg-error-config compatible to pkg-config.NIIBE Yutaka2018-09-116-5/+668
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (AC_CONFIG_FILES): Generate src/gpg-error.pc, as well as src/gpg-error-config-old and src/gpg-error-config-new. * src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New. (EXTRA_DIST): Add gpg-error-config-new.in, gpg-error-config-test.sh, and gpg-error.pc.in. (CLEANFILES): Add gpg-error-config gpg-error-config-test.log. (TESTS): New. (gpg-error-config): New target. * src/gpg-error-config-new.in: New. * src/gpg-error-config-test.sh: New. * src/gpg-error.pc.in: New. * src/gpg-error.m4 (GPG_ERROR_MT_CFLAGS): Use --variable. (GPG_ERROR_MT_LIBS, gpg_error_config_host): Likewise. -- This change is to privide gpg-error.pc for pkg-config, so that developers can use pkg-config to configure their applications. The gpg-error-config script is also kept supported for applications which want to avoid dependency of pkg-config. Note that new gpg-error-config script uses gpg-error.pc as master data, so that it can keep compatibility to pkg-config easily. In the new gpg-error-config script, features are added to increase compatibility to pkg-config, like --variable option and multiple module support. However, it is not meant to oriented to be a full-fledged version of pkg-config, only a small set of features is supported. To be conservative, new gpg-error-config is checked at build time against old gpg-error-config. On the host which fails, old gpg-error-config will be installed with a warning. GnuPG-bug-id: 4085 Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgscm: Suppress warnings for GCC > 6.NIIBE Yutaka2018-09-061-15/+14
| | | | | | | | | | | | | | | | | | | | * tests/gpgscm/scheme.c (CASE): Use unused attribute for GCC > 6. (FALLTHROUGH): New for fallthrough. (Eval_Cycle): Use FALLTHROUGH. Remove not-needed comment of fallthrough. -- Since GCC combines C preprocessor macro expansion, the fallthrough comment doesn't work well to suppress warnings for -Wimplicit-fallthrough, near the macro CASE. To handle this problem, we use GCC's extension of unused label and fallthrough attributes. Signed-off-by: NIIBE Yutaka <[email protected]> Cherry-picked from gnupg master commit of: 99c17b970bc0ca7e0cff7fe031c6f9feb05af3ff
* po: Fix the previous commit.NIIBE Yutaka2018-09-061-2/+2
| | | | Signed-off-by: NIIBE Yutaka <[email protected]>