summaryrefslogtreecommitdiffstats
path: root/external/libassuan
Commit message (Collapse)AuthorAgeFilesLines
* Removed executable permission on data filesAndrea Gelmini2018-05-041-0/+0
| | | | | | | | | chmod -x for .patch, .pptm, and .vb Change-Id: I98e1221e48df22e8b58aaf305898cbe301f187ce Reviewed-on: https://gerrit.libreoffice.org/52568 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Fix external/libassuan Linux RPATHStephan Bergmann2018-03-082-0/+12
| | | | | | | | | | | | | | | In other external projects using libtool, we fix that by patching configure, resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block that sets the Linux-specific value. But here we run autoreconf in ExternalProject_libassuan, so that patch in configure would be overwritten. The relevant code in configure comes from autoconf boilerplate, so we cannot just do the same patch in configure.ac. But we can reset hardcode_libdir_flag_spec sufficiently late in configure.ac so that things still work as intended. Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa Reviewed-on: https://gerrit.libreoffice.org/50959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* libassuan: upgrade to release 2.5.1Thorsten Behrens2017-12-113-6/+8
| | | | | | | Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c Reviewed-on: https://gerrit.libreoffice.org/46205 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* external: fix host setup for gpgme and libassuanThorsten Behrens2017-12-111-2/+2
| | | | | | | Change-Id: I9315a2158dce7d06a875787428e17eb75826de37 Reviewed-on: https://gerrit.libreoffice.org/46222 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* fix fuzzer buildCaolán McNamara2017-12-081-0/+1
| | | | | | | | Change-Id: I87933b78126ffbf29999f4d17b212df21560bdbd Reviewed-on: https://gerrit.libreoffice.org/46080 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#114086: Fix macOS paths of external GPG librariesStephan Bergmann2017-12-051-0/+5
| | | | | | | Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7 Reviewed-on: https://gerrit.libreoffice.org/45825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* gpg4libre: pass windows arch down to windresThorsten Behrens2017-12-041-5/+6
| | | | | | | | | | | | At least for cygwin64 windres, a wider number of cross-building targets are supported. Utilize that for getting suitable versionrc arch built, obviating the need to disable x86_64 on cyg32 and vice versa. Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4 Reviewed-on: https://gerrit.libreoffice.org/45763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: remove silly afxres.h / MFC dependency from gpgmeThorsten Behrens2017-12-042-0/+13
| | | | | | | Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d Reviewed-on: https://gerrit.libreoffice.org/45458 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Use Executable_cpp instead of default gcc as preprocessor for windresStephan Bergmann2017-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to avoid having GCC as yet another prerequisite on Windows. Cygwin 'man windres' states: "The default preprocessor argument is 'gcc -E -xc-header -DRC_INVOKED'." Of those arguments, -E and -xc-header are not relevant for Executable_cpp, so only -DRC_INVOKED is kept. Additional arguments that turned out to be necessary are: -I$(ATL_INCLUDE) So that #include <afxres.h> in workdir/UnpackedTarball/libgpg-error/src/versioninfo.rc is found. (Not sure how the original code using gcc found this.) -+ So that using a C++ style comment in #include "winres.h" // extract from windows header in afxres.h does not cause a "Syntax error in #include" from Executable_cpp. $(SOLARINC) So that #include "winres.h" // extract from windows header in afxres.h is found. (Not sure how the original code using gcc found this.) -DWINAPI_FAMILY=0 Because dlgs.h (included indirectly from afxres.h) contains #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) [...] typedef struct tagCRGB { BYTE bRed; BYTE bGreen; BYTE bBlue; BYTE bExtra; } CRGB; /* RGB Color */ and the WINAPI_FAMILY_PARTITION conditional (defined in winapifamily.h) would be true, causing the output to contain those "typedef struct tagCRGB ..." tokens that windres apparently doesn't expect (failing with "windres: can't open file `tagCRGB': No such file or directory"). (Not sure how the original code using gcc avoided this.) Change-Id: Ic2d031c72025f2e9dbde26c774215d2d2d0a43a9 Reviewed-on: https://gerrit.libreoffice.org/45334 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
* Missing --tag=RCStephan Bergmann2017-11-271-0/+11
| | | | | | | | | | | | | | | | | | ...causing failure > make[5]: Entering directory 'workdir/UnpackedTarball/libassuan/src' > C:/cygwin64/bin/sh.exe ../libtool --mode=compile windres --preprocessor=[...]' `echo -DHAVE_CONFIG_H -I. -I.. | sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i versioninfo.rc -o versioninfo.lo > libtool: compile: unable to infer tagged configuration > libtool: compile: specify a tag with `--tag' > make[5]: *** [Makefile:1172: versioninfo.lo] Error 1 for me. (And note how e.g. workdir/UnpackedTarball/libgpg-error/src/Makefile.am contains such a --tag=RC, too.) Change-Id: I3919a59d5443c558d9bc37fd0a851ea161f44406 Reviewed-on: https://gerrit.libreoffice.org/45344 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Pass $(verbose) into ExternalProject_libassuanStephan Bergmann2017-11-271-0/+1
| | | | | | | Change-Id: I66771b49933a9092ad0c07c5ebaabfb3d80dcdcd Reviewed-on: https://gerrit.libreoffice.org/45343 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* libassuan: cleanup patchsetThorsten Behrens2017-11-251-24/+0
| | | | | | | | | As noted by Stephan in gerrit#42745 Change-Id: Id8fd3000e7469b9eb2a0c5301ef9ce71b8a77723 Reviewed-on: https://gerrit.libreoffice.org/45242 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Pass $(MAKE) into external/libassuanStephan Bergmann2017-11-241-0/+1
| | | | | | | Change-Id: I82d775645018b6ce92e4cbc1c8cd67af958bfa21 Reviewed-on: https://gerrit.libreoffice.org/45165 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* gpg4libre: build libassuan natively on windowsDavid Ostrovsky2017-11-223-0/+94
| | | | | | | | Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114 Reviewed-on: https://gerrit.libreoffice.org/42745 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* fix windows packagingThorsten Behrens2017-10-261-1/+1
| | | | | | | Change-Id: Id9e306877125b66f908d24048d236c55483330d0 Reviewed-on: https://gerrit.libreoffice.org/43916 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: enable OpenPGP support for MacThorsten Behrens2017-10-261-0/+8
| | | | | | | | Change-Id: Iad7d6b045be90efb32da3ffb1c19753b58b1753d Reviewed-on: https://gerrit.libreoffice.org/43616 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: get rpath right for gpgmeThorsten Behrens2017-03-053-0/+25
| | | | | | | | | | Also add initial crossbuild support, and avoid extraneous build targets (docs, arcane lang support) Change-Id: I51afa2ff91c576b35dcb73124396188b780ed84e Reviewed-on: https://gerrit.libreoffice.org/34898 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: fix gpgme build dependenciesThorsten Behrens2017-02-171-0/+4
| | | | | | | | Change-Id: If71b144f008e35ee248421d922ab2a1a4463d093 Reviewed-on: https://gerrit.libreoffice.org/34361 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: fix build for older autoconf/automake versionsThorsten Behrens2017-02-172-0/+57
| | | | | | | | | | | | | | | | | | | - serial-tests fix from Richard Jones' libguestfs (lgplv2+) (needed for automake < 1.12) - m4_esyscmd fix from slurm project (gplv2+), needed for autoconf < 2.62 or so - m4_argn from m4 sugar (gplv3+ with autoconf exceptions) - AC_CHECK_FUNCS does not like nested macros, so outline dependend AC_CHECK_HEADERS - only build c and c++ bindings for gpgme, we don't need anything else internally. Change-Id: Ic65ca92119efda585ebc9acbfb7c6c2ac2585451 Reviewed-on: https://gerrit.libreoffice.org/34349 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
* gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)Katarina Behrens2017-02-164-0/+52
| | | | | | | | Change-Id: I1953e7062b872340b844771adc8ebe40f524cc76 Reviewed-on: https://gerrit.libreoffice.org/34227 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* gpg4libre: Download external gpgme and dependent libsKatarina Behrens2017-02-034-0/+47
in particular, libgpg-error and libassuan This only downloads and unpacks the tarball. Building them needs some work still Change-Id: I562fd01571929ddfb47a319038f88ea8dbfb4bdd Reviewed-on: https://gerrit.libreoffice.org/33712 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>