gpg4win.git
6 years agoAdjust patches for GnuPG 2.0.21.
Werner Koch [Wed, 3 Jul 2013 13:33:53 +0000 (15:33 +0200)]
Adjust patches for GnuPG 2.0.21.

* patches/gnupg2/02-allow-mark-trusted.patch: Move to ...
* patches/gnupg2-2.0.20/: new directory.
* Makefile.am (EXTRA_DIST): Adjust for this.
--

We only allow current versions of GnuPG to be build with the
installer, thus we explicitly support 2.0.20 but prepare for future
version by removing a patch which meanwhile has be integrated into
GnuPG 2.0 proper.

6 years agoPost release version bump.
Werner Koch [Mon, 1 Jul 2013 12:51:51 +0000 (14:51 +0200)]
Post release version bump.

--

(A bit late, though)

6 years agoGet rid of the include/ directory.
Werner Koch [Mon, 1 Jul 2013 12:02:15 +0000 (14:02 +0200)]
Get rid of the include/ directory.

* include/config.nsi.in: Move to src/
* include/Makefile.am: Remove.
* include/: Remove.
* src/Makefile.am (EXTRA_DIST): Add config.nsi.
* Makefile.am (SUBDIRS): Remove "include".
* configure.ac (AC_CONFIG_FILES): Remove include/Makefile.am.
Add src/config.nsi.
* src/gpg4win-src.nsi, src/gpg4win.nsi: Adjust include directive for
config.nsi.
--

A separate include directory does not make sense and is often gets in
the way when grepping for things.

6 years agoMerge branch 'gpgex64'
Andre Heinecke [Mon, 1 Jul 2013 09:47:54 +0000 (09:47 +0000)]
Merge branch 'gpgex64'

6 years agoFinal changes to install a 64 bit version of GpgEX.
Werner Koch [Mon, 1 Jul 2013 08:47:43 +0000 (10:47 +0200)]
Final changes to install a 64 bit version of GpgEX.

* configure.ac: Drop unneeded dependencies for the 64 bit pekes.
Re-add those tools as regular SPKG modules.

* src/Makefile.am (gpg4win_pkg_libgpg_error_ex_configure)
(gpg4win_pkg_libassuan_ex_configure): Add to build static libraries.
* src/gpg4win.mk.in (ex_ipdir): New.
(stamps/stamp-directories, stamps/stamp-$(1)-ex-05-stow)
(clean-ex-$(1)): Use ex_ipdir.

* src/inst-gettext.nsi, src/uninst-gettext.nsi: Change name of the
installed DLL.

* src/inst-glib.nsi: Move installation of charset.alias to ..
* src/inst-libiconv.nsi: here.

* src/inst-libiconv.nsi, src/uninst-libiconv.nsi: Adjust name of
libiconv.dll but also install under the old name.

* src/installer.nsi: Include x64.nsh.
* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: On 64 bit boxes, install
also the 64 bit version.

* src/gpg4win.nsi: Add RequestExecutionLevel directive.

* src/gpg4win.nsi: Use /SOLID for the compressor settings.
--

Some of the above changes are merely to avoid surprises regarding the
64 bit versions of the modules which used to be installed under
install-ex/ but stowed from the regular install/pkgs directory.

Using /SOLID shrinks the installer considerably (16 to 13 MB for the
light installer).

The use of RequestExecutionLevel is not really needed because Windows
seems to know about NSIS installer but it is nevertheless good style
to correctly mark the installer.

6 years agoFix setting of the 64 bit toolkit.
Werner Koch [Fri, 28 Jun 2013 10:46:52 +0000 (12:46 +0200)]
Fix setting of the 64 bit toolkit.

* autogen.sh (myhostsub): Set default toolkit to x86_64-w64-mingw32.

6 years agoUpdate GpgEX, libgpg-error and libassuan.
Werner Koch [Fri, 28 Jun 2013 10:45:39 +0000 (12:45 +0200)]
Update GpgEX, libgpg-error and libassuan.

6 years agoMake git revision detection more robust.
Werner Koch [Fri, 28 Jun 2013 08:18:09 +0000 (10:18 +0200)]
Make git revision detection more robust.

* configure.ac (git_revision): Use git rev-parse for parsing.

6 years agoAdd more packages as gpg4win_expkgs
Andre Heinecke [Fri, 14 Jun 2013 17:23:01 +0000 (17:23 +0000)]
Add more packages as gpg4win_expkgs

    * src/Makefile.am: Add more packages to gpg4win_expkgs

--
    Build currently errors out at libassuan

6 years agoFix STOW_EX macro to store in idir_ex
Andre Heinecke [Fri, 14 Jun 2013 17:21:32 +0000 (17:21 +0000)]
Fix STOW_EX macro to store in idir_ex

    * src/gpg4win.mk.in: Add target parameter to stow call for extra
    architecture packages.

6 years agoAdd the possibility to change the make directroy
Andre Heinecke [Fri, 14 Jun 2013 17:15:28 +0000 (17:15 +0000)]
Add the possibility to change the make directroy

    This adds gpg4win_pkg_<name>_make_dir to change the
    directory in which make is called. This path is relative
    to the packages source directory.
    Used for gettext to build only gettext-runtime

    * src/Makefile.am: Set make directories for gettext to build
    only runtime.
    * src/gpg4win.mk.in: Add gpg4win_pkg_<name>_make_dir and
    handle it.

--

    Gettext-tools are uneccessary for us and don't compile with
    mingw-w64 withot patches. And while this adds an additional
    config macro it gives us more flexibility in the build process
    to handle such things.

6 years agoAdd build-w32-w64 convenience option
Andre Heinecke [Fri, 14 Jun 2013 15:11:29 +0000 (15:11 +0000)]
Add build-w32-w64 convenience option

    By default this option checks for amd64-mingw32msvc and
    calls configure with settings to additionally build gpgex
    for this host.

    * autogen.sh: Add option to build gpgEx for an x64 host

6 years agoMark gpgEx dependencies as SPGKEX packages
Andre Heinecke [Fri, 14 Jun 2013 15:04:37 +0000 (15:04 +0000)]
Mark gpgEx dependencies as SPGKEX packages

    This enables the new additional host logic for those
    packages.

    * configure.ac: Switch iconv / gettext to source packages and
    mark them as SPKGEX packages. Mark gpgEx dependencies as such.
    * packages/packages.current: Update libiconv and gettext and
    switch to source tarballs.
    * src/Makefile.am: Add iconv / gettext as source packages.
    Add gpgEx depdencies as gpg4win_expkgs

--
    gettext-tools are still resisting compilation. For now I've
    manually stepped in the build process to just build gettext-runtime.
    libiconv and w32-pth work as intended in the new extra architecture
    logic.

6 years agoAdd addititional-gpgex-host feature
Andre Heinecke [Fri, 14 Jun 2013 15:00:13 +0000 (15:00 +0000)]
Add addititional-gpgex-host feature

    You can now use --with-additional-gpgex-host=HOST to declare
    an additional host triplet for which gpgEx and it's dependencies
    should be built.

    * configure.ac: Add additional-gpgex-host option

6 years agoAdd macros for packages in extra architecture
Andre Heinecke [Fri, 14 Jun 2013 14:50:03 +0000 (14:50 +0000)]
Add macros for packages in extra architecture

    This is a requirement to build gpgEx both for x86 and
    amd64 architectures.

    * m4/gpg4win.m4 (GPG4WIN_CHECK_EXDEPS, GPG4WIN_SPKGEX): New.
    * src/gpg4win.mk.in (SETVARS_EX, STRIP_EX, GETDEPS_EX): New
    helper macros for building in another architecture.
    * src/gpg4win.mk.in (EXPKG_template): New template to build
    for an additional host as defined by GPGEX_ADD_HOST

--
    If we build for another architecture we now use an additional
    install-ex directory in which we install and stow the packages
    needed in a different architecture. The GPG4WIN_SPKGEX macro
    can be used to mark down packages that should be built in both
    the host architecture and in an additional architecture defined
    by GPGEX_ADD_HOST.

6 years agoRelease 2.1.1. gpg4win-2.1.1
Werner Koch [Tue, 28 May 2013 16:25:14 +0000 (18:25 +0200)]
Release 2.1.1.

6 years agoUpdate kleopatra to a build against gpgme 1.4.2
Andre Heinecke [Tue, 28 May 2013 16:13:29 +0000 (16:13 +0000)]
Update kleopatra to a build against gpgme 1.4.2

    This also includes kdepimlibs revision 647e28e2 which
    handles the new gpgme types.

    * packages/packages.current: Update kleopatra packages.

6 years agoRemove obsolete patches.
Werner Koch [Tue, 28 May 2013 10:33:33 +0000 (12:33 +0200)]
Remove obsolete patches.

* patches/claws-mail-3.7.4cvs1/01-bug_2098.patch: Remove.
* patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch: Remove.
* patches/dirmngr-1.0.3/01-ldaphttp.patch: Remove.
* patches/glib-2.12.12/01-giowin32.patch: Remove.
* patches/glib-2.12.12/02-gspawn-w32.patch: Remove.
* patches/glib-2.12.12/03-gspawn-w32-fixup.patch: Remove.
* patches/gnupg2-2.0.12/01-scd-pw2.patch: Remove.
* patches/gnupg2-2.0.12/02-pth-estream.patch: Remove.
* patches/gnupg2-2.0.12/03-opgp-writekey.patch: Remove.
* patches/gnupg2-2.0.12/04-hash-prefs.patch: Remove.
* patches/gnupg2-2.0.12/05-dns-sd.patch: Remove.
* patches/gnupg2-2.0.12/06-opgp-sign3072.patch: Remove.
* patches/gnupg2-2.0.12/07-gpg-no-detached.patch: Remove.
* patches/gnupg2-2.0.12/08-sm-learn-card.patch: Remove.
* patches/gnupg2-2.0.12/09-sm-keylist.patch: Remove.
* patches/gnupg2-2.0.12/10-inv-sgnr.patch: Remove.
* patches/gnupg2-2.0.12/11-photoid-sk.patch: Remove.
* patches/gnupg2-2.0.14/01-encode-s2k.patch: Remove.
* patches/gnupg2-2.0.14/02-scd-no-service.patch: Remove.
* patches/gnupg2-2.0.16/01-estream.patch: Remove.
* patches/gnupg2-2.0.16/02-gpgtar.patch: Remove.
* patches/gnupg2-2.0.16/03-kbx-realloc.patch: Remove.
* patches/gnupg2-2.0.16/04-gpgtar-2.patch: Remove.
* patches/gnupg2-2.0.16/05-err-codes.patch: Remove.
* patches/gnupg2-2.0.16/06-reread-agent.patch: Remove.
* patches/gnupg2-2.0.17/01-scd-reader-removal.patch: Remove.
* patches/gnupg2-2.0.8/01-agent-call-pinentry.patch: Remove.
* patches/gnupg2-2.0.8/02-qualified.patch: Remove.
* patches/gnupg2-2.0.8/03-create-keyring.patch: Remove.
* patches/gnupg2-2.0.8/04-import-export-spawn.patch: Remove.
* patches/gnupg2-2.0.8/05-gpgconf.patch: Remove.
* patches/gnupg2-2.0.8/06-gpgconf-list.patch: Remove.
* patches/gnupg2-2.0.9/01-close-all-handle.patch: Remove.
* patches/gnupg2-2.0.9/02-de.po-fix.patch: Remove.
* patches/gnupg2-2.0.9/03-i18n+etc.patch: Remove.
* patches/gnupg2-2.0.9/04-ks-w32init.patch: Remove.
* patches/gnupg2-2.0.9/05-w32-http.patch: Remove.
* patches/gpa-0.9.0/01-title-prop.patch: Remove.
* patches/gpgex-0.9.3/01-full-browser.patch: Remove.
* patches/gpgex-0.9.3/02-doc.patch: Remove.
* patches/gpgme-1.1.7/01-registry.patch: Remove.
* patches/gpgme-1.1.7/02-extern-umlaute.patch: Remove.
* patches/gpgme-1.1.7/03-error-parsing.patch: Remove.
* patches/gpgme-1.2.0/01-w32-io-threads.patch: Remove.
* patches/gpgme-1.2.0/02-inv-signer.patch: Remove.
* patches/gpgme-1.2.0/03-w32-socket.patch: Remove.
* patches/gpgme-1.2.0/04-check-agent.patch: Remove.
* patches/gpgme-1.2.0/05-is-socket.patch: Remove.
* patches/gpgme-1.4.1/01-improve-trace.patch: Remove.
* patches/gpgme-1.4.1/02-close-socket.patch: Remove.
* patches/gpgme-1.4.1/03-simplify-closing.patch: Remove.
* patches/gpgol-0.9.91/01-gpgme.patch: Remove.
* patches/scute-1.2.0/01-bugfixes.patch: Remove.
* Makefile.am (EXTRA_DIST): Remove those patches.

6 years agoUpdate gpgme to version 1.4.2.
Werner Koch [Tue, 28 May 2013 10:30:58 +0000 (12:30 +0200)]
Update gpgme to version 1.4.2.

6 years agoUpdate Kleopatra binary package
Andre Heinecke [Thu, 16 May 2013 08:15:12 +0000 (08:15 +0000)]
Update Kleopatra binary package

    This build contains an additional patch to fix kuinqueapplication
    on Windows so that it calls newInstance on the already running
    instance.

    * packages/packages.current: Update kleopatra packages

6 years agoCall _spawnv with NOWAIT parameter for Kleopatra
Andre Heinecke [Thu, 16 May 2013 07:58:00 +0000 (07:58 +0000)]
Call _spawnv with NOWAIT parameter for Kleopatra

    As kbuildsycoca is executed by CreateProcess and not by
    _spawnv there is no reason to wait for Kleopatra to finish
    and leave the additional kleowrap process hanging around.

    * src/kleowrap.c (main): Call _spwanv with NOWAIT instead of
    WAIT

6 years agoUpdate Kleopatra package to gpg4win HEAD
Andre Heinecke [Wed, 15 May 2013 14:55:11 +0000 (14:55 +0000)]
Update Kleopatra package to gpg4win HEAD

    This includes a fix for frozen windows in combination
    with gpgOl

    * packages/packages.current: Update kleopatra version

6 years agoAdd uninstallation compatibility to 2.1.0
Andre Heinecke [Wed, 15 May 2013 14:46:52 +0000 (14:46 +0000)]
Add uninstallation compatibility to 2.1.0

    This also deletes files that were installed by previous
    versions of gpg4win

    * src/uninst-gnutls.nsi: Remove libgnutls-openlss-26.dll
    * src/uninst-qt.nsi: Remove files provided in old qt package
    * src/uninst-kleopatra.nsi: Remove various files installed
    by kdesupport, kdelibs et. al

6 years agoUpdate oxygen icons to include missing icons
Andre Heinecke [Wed, 15 May 2013 14:37:47 +0000 (14:37 +0000)]
Update oxygen icons to include missing icons

    This fixes cpu spikes in the about dialog, and help menu.
    Really.

    * packages/packages.current: Update Package versions.
    * src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi:
    Install / Uninstall files.

6 years agoUpdate Qt and Kleopatra builds
Andre Heinecke [Tue, 14 May 2013 12:57:26 +0000 (12:57 +0000)]
Update Qt and Kleopatra builds

    Qt is now built withot usage of CPU extensions and Kleopatra
    contains an updated kdelibs that fixes a problem in the
    Window Management on Windows

    * packages/packages.current: Update Qt and Kleopatra builds

6 years agoFix libpng server url
Andre Heinecke [Tue, 14 May 2013 08:45:09 +0000 (08:45 +0000)]
Fix libpng server url

    The libpng-1.4.12 has been moved to a subdirectory

    * packages/packages.current: Add subdirectory to libpng server url

6 years agoUpdated 'Changes' section in README for next beta release.
Emanuel Schuetze [Wed, 15 May 2013 14:50:19 +0000 (16:50 +0200)]
Updated 'Changes' section in README for next beta release.

6 years agoUpdate zlib to 1.2.8.
Werner Koch [Wed, 15 May 2013 14:26:50 +0000 (16:26 +0200)]
Update zlib to 1.2.8.

6 years agoTemporary fix for mingw off_t mess.
Werner Koch [Wed, 15 May 2013 14:24:39 +0000 (16:24 +0200)]
Temporary fix for mingw off_t mess.

* patches/gpgol-1.1.3/02-off_t.postcfg-build: New.
* Makefile.am (EXTRA_DIST): Add patch
--

The problem with w64-mingw32's off_t hack is that it is incompatible
to Windows.  It works nicely with most software but the DLL's using
off_t in the public API (e.g. libgpgme) can't be used by MSVC build
programs.  That is a regression.

The tentative plan to fix this in gpgme is to use int32_t instead of
off_t on Windows.

6 years agoUpdate paperkey to 1.3
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Update paperkey to 1.3

6 years agoAdd leftover files to the uninstaller.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Add leftover files to the uninstaller.

--

Also removed superfluous RMDir commands.

6 years agoUpdate AUTHORS, NEWS and README.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Update AUTHORS, NEWS and README.

--

6 years agoUpdate list of copyright notices.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Update list of copyright notices.

* doc/pkg-copyright.txt: Update.

6 years agoInstall dbus config into /etc
Andre Heinecke [Mon, 13 May 2013 07:08:35 +0000 (07:08 +0000)]
Install dbus config into /etc

    Configurations in /etc overwrite /etc/dbus-1 this is a
    problem when overwriting an old installation.

    * src/inst-dbus.nsi, src/uninst-dbus.nsi: Overwrite old config
    in /etc

6 years agoFix startup hangs in Kleopatra.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Fix startup hangs in Kleopatra.

* patches/gpgme-1.4.1/03-simplify-closing.patch: New.
* Makefile.am (EXTRA_DIST): Add patch.
--

Final-last-words: Yeah, solved that nasty bug.

6 years agoRemove remaining claws plugin cruft.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Remove remaining claws plugin cruft.

* src/Makefile.am (EXTRA_DIST): Remove rssyl and vcalendar.

6 years agoUpdate GnuPG to 2.0.20.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
Update GnuPG to 2.0.20.

6 years agoMake make distcheck work.
Werner Koch [Fri, 10 May 2013 16:47:29 +0000 (18:47 +0200)]
Make make distcheck work.

* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Use host i686-w64-mingw32.

6 years agoFix building of msis-msgfmt.
Werner Koch [Fri, 10 May 2013 14:22:26 +0000 (16:22 +0200)]
Fix building of msis-msgfmt.

* po/Rules-nsis (nsis-msgfmt): Use detected build compiler.
* po/build-cc.in: New.
* configure.ac (BUILD_CC): New ac_subst.

6 years agoclaws: Cleanup removed packages NSI code.
Werner Koch [Fri, 10 May 2013 11:14:01 +0000 (13:14 +0200)]
claws: Cleanup removed packages NSI code.

* src/inst-sections.nsi: Enable libxml2 if rssyl is selected.  Remove
dependency checks for removed plugin packages.
* include/config.nsi.in: Remove code for remove plugin packages.
claws: Cleanup removed packages NSI code.

6 years agoAvoid makensis printing all symbols from gcc runtime libs.
Werner Koch [Fri, 10 May 2013 11:04:00 +0000 (13:04 +0200)]
Avoid makensis printing all symbols from gcc runtime libs.

* configure.ac: Store gcc runtile libs under a different name
* src/inst-gpg4win.nsi: Adjust for that name change.

6 years agoclaws: Update gtkhtml_2_viewer plugin.
Werner Koch [Fri, 10 May 2013 11:01:24 +0000 (13:01 +0200)]
claws: Update gtkhtml_2_viewer plugin.

* patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build: New.
* Makefile.am (EXTRA_DIST): Add patch.
* packages/packages.current: Enable gtkhtml2_viewer and update to
latest version.

6 years agoFix language setting for non germans
Andre Heinecke [Fri, 10 May 2013 16:02:21 +0000 (16:02 +0000)]
Fix language setting for non germans

    Kleopatra is in en_US if it is not in german.

    * src/inst-kleopatra.nsi: Fix langauge configuration

--
    $LANGUAGE contains a number for example 1033 for english
    so this can't be used as kde language configuration

6 years agoRemove references to removed claws plugins
Andre Heinecke [Fri, 10 May 2013 10:12:19 +0000 (10:12 +0000)]
Remove references to removed claws plugins

    This removes no longer existing files from extra dist and
    the configuration options for those packages.

    * src/Makefile.am: Remove references to notification_plugin,
   tnef_parse, bsfilter_plugin and attachwarner.

6 years agoclaws: Add rssyl, spamreport, and vcalendar plugins.
Werner Koch [Fri, 10 May 2013 09:48:36 +0000 (11:48 +0200)]
claws: Add rssyl, spamreport, and vcalendar plugins.

* packages/packages.current: Update Curl to 7.30.0.
* src/inst-claws-mail.nsi: Install internal plugins rssyl, spamreport
and vcalendar.
* src/uninst-claws-mail.nsi: Uninstall them.
* src/inst-sections.nsi: Remove old external plugins.
* src/inst-rssyl.nsi, src/inst-vcalendar.nsi, src/uninst-rssyl.nsi
* src/uninst-vcalendar.nsi: Remove.

6 years agoUpdate to claws 3.9.1.
Werner Koch [Fri, 10 May 2013 08:47:17 +0000 (10:47 +0200)]
Update to claws 3.9.1.

* packages/packages.current: Update claws.
* patches/claws-mail-3.9.1/01-w64-mingw32.patch: New.
* patches/claws-mail-3.9.1/02-ldap-opt.patch: new.
* patches/claws-mail-3.9.1/03-all-crypto.patch: New.
* patches/claws-mail-3.9.1/20-c416e89d.patch: New
* patches/claws-mail-3.9.1/21-66aa06c7.patch: New.
* patches/claws-mail-3.9.1/50-configure.patch: New.
* patches/claws-mail-3.9.1/51-version-file.patch: New.
* patches/claws-mail-3.9.1/80-src-makefile.postcfg-build: new.
* Makefile.am (EXTRA_DIST): Add new patches.  Remove 3.9.0 patches.
* src/Makefile.am (gpg4win_pkg_claws_mail_configure): Adjust options.
* src/inst-claws-mail.nsi: Install now included plugins.
* src/uninst-claws-mail.nsi: Uninstall them.
* include/config.nsi.in, src/inst-sections.nsi: Remove support for the
now included plugins.
* src/inst-attachwarner.nsi, src/inst-bsfilter_plugin.nsi
* src/inst-notification_plugin.nsi, src/inst-tnef_parse.nsi
* src/uninst-attachwarner.nsi, src/uninst-bsfilter_plugin.nsi
* src/uninst-notification_plugin.nsi, src/uninst-tnef_parse.nsi: Remove.

6 years agoUpdate kleopatra to latest gpg4win branch
Andre Heinecke [Fri, 10 May 2013 07:44:15 +0000 (07:44 +0000)]
Update kleopatra to latest gpg4win branch

    packages/packages.current: Update Kleopatra bin and src packages

6 years agoEnable libenchant again.
Werner Koch [Wed, 8 May 2013 18:56:20 +0000 (20:56 +0200)]
Enable libenchant again.

--

6 years agoFix a hang in gpgme.
Werner Koch [Wed, 8 May 2013 18:54:49 +0000 (20:54 +0200)]
Fix a hang in gpgme.

* patches/gpgme-1.4.1/01-improve-trace.patch: New.
* patches/gpgme-1.4.1/02-close-socket.patch:
* Makefile.am (EXTRA_DIST): Add patches.
--

When using a socket (e.g. polling scdaemon) the closing of the socket
often blocked waiting on termination of the reader thread.  At that
point the reader table lock is also held and thus no other reader
thread could be started.  See the comments in the code for out
solution.

Note that there is currently another hang in Kleopatra, the first time
it is started. I was able to workaround that by disabling the startup
selftests.

6 years agoImprove detection of libstdc++-6 et al.
Werner Koch [Wed, 8 May 2013 08:46:53 +0000 (10:46 +0200)]
Improve detection of libstdc++-6 et al.

* configure.ac: Extract gcc version number and use as default
directory of gcc helper DLLs.

6 years agoAdd runtime libaries neccessary with mingw-w64
Andre Heinecke [Tue, 7 May 2013 10:49:32 +0000 (10:49 +0000)]
Add runtime libaries neccessary with mingw-w64

    GpgOL and GpgEx need the mingw runtime in the system path
    so they are added to pub now.

    * configure.ac: Add options for libgcc-sjlj-1 and libstdc++-6
    * src/inst-gpg4win.nsi, src/uninst-gpg4win.nsi: Handle
    the runtime libraries.

6 years agoFix localization and help installation
Andre Heinecke [Tue, 7 May 2013 10:45:54 +0000 (10:45 +0000)]
Fix localization and help installation

    This adds a kdeglobals configuration with the language setting
    to workaround a bug in KDE/4.10 libs.

    * src/Makefile.am: Change help link replacement to fit
    installation
    * src/inst-kleopatra.nsi: Move some files and install kdeglobals
    depending on language setting
    * src/uninst-kleopatra.nsi: Fix some paths and add some more

6 years agoAdd path paths also into our environment
Andre Heinecke [Tue, 7 May 2013 10:42:06 +0000 (10:42 +0000)]
Add path paths also into our environment

    This is necessary as we need PATH to include /pub
    when we register gpgex and gpgol.

    * src/g4wihelp.c (path_add): Set path environemnt variable
    after adding

6 years agoUpdate libetpan to 0.58-g10-1.
Werner Koch [Mon, 6 May 2013 16:24:07 +0000 (18:24 +0200)]
Update libetpan to 0.58-g10-1.

6 years agoUpdate Claws to 3.9.0.
Werner Koch [Mon, 6 May 2013 15:48:18 +0000 (17:48 +0200)]
Update Claws to 3.9.0.

* packages/packages.current: Update to claws 3.9.0.
* patches/claws-mail-3.9.0/01-w64-mingw32.patch: New.
* patches/claws-mail-3.9.0/02-ldap-opt.patch: New.
* patches/claws-mail-3.9.0/03-all-crypto.patch: New.
* patches/claws-mail-3.9.0/80-src-makefile.postcfg-build: New.
* Makefile.am (EXTRA_DIST): Add new patch files.
--

This update also adds support for w64-mingw32 and enables all crupto
plugins by default.

6 years agoSet a fixed limit of 2047 to the length of PATH.
Werner Koch [Mon, 6 May 2013 10:35:02 +0000 (12:35 +0200)]
Set a fixed limit of 2047 to the length of PATH.

* src/g4wihelp.c (PATH_LENGTH_LIMIT): New.

6 years agoUpdate kleopatra build
Andre Heinecke [Fri, 3 May 2013 16:42:22 +0000 (16:42 +0000)]
Update kleopatra build

    This build now comes from the gpg4win branch and has
    some reduced dependencies. It also includes additional
    needed configuration files.

    * packages/packages.current: Update kleopatra
    * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update
    installation

6 years agoLink pinentry with a static libstdc++
Andre Heinecke [Thu, 2 May 2013 15:41:55 +0000 (15:41 +0000)]
Link pinentry with a static libstdc++

    This avoids a depedency to libstdc++.dll.
    * src/Makefile.am: Add CXXFLAGS for pinentry to link static
    libstdc++

--
    This should be safe as pinentry neither does exceptions
    nor dynamic loading.
    Qt itself also links libstdc++ statically.

6 years agoUpdate gpa and gpgme.
Werner Koch [Wed, 1 May 2013 12:42:42 +0000 (14:42 +0200)]
Update gpa and gpgme.

* packages/packages.current: Update gpa and gpgme.
* patches/gpgme-1.4.0/01-off_t.postcfg-build: Remove
* Makefile.am: Remove above patch.

6 years agoUpdate GTK+ related packages.
Werner Koch [Tue, 30 Apr 2013 09:19:20 +0000 (11:19 +0200)]
Update GTK+ related packages.

* packages/packages.current: Update glib, gdk_pixbuf, gtk+, libffi and
check all other packages for necessary updates.
* patches/glib-2.34.3/01-socket.patch: Copy from 2.24.0.
* patches/glib-2.34.3/02-no-kill.patch: New.
* Makefile.am (EXTRA_DIST): Add new patches.
* src/Makefile.am (gpg4win_pkg_glib_configure): Add
option --disable-modular-tests.
* src/inst-libffi.nsi: Update SO-name from 5 to 6.
* src/uninst-libffi.nsi: Ditto.  Remove unneeded top dir rmdir.
--

The update of glib from 2.32 to 2.34 is due to a changed requirement
in gdk_pixbuf 2.26.5 (which has been updated from 2.26.0).

Note that the GPA crashes in the latest beta are due to the missing
01-socket.patch.  I simply forgot to copy it to the newer gtk version.
We should tell the GTK folks to include our patches.

6 years agoRemove gpa_logo.ppm from packaging
Andre Heinecke [Mon, 29 Apr 2013 17:30:19 +0000 (17:30 +0000)]
Remove gpa_logo.ppm from packaging

    It is now only installed as gpa-log.ppm so packaging this
    should be enough.

    * src/inst-gpa.nsi, src/uninst-gpa.nsi: Remove gpa_logo.ppm

6 years agoFix syntax errors caused by KDE/4.10 update
Andre Heinecke [Mon, 29 Apr 2013 17:28:51 +0000 (17:28 +0000)]
Fix syntax errors caused by KDE/4.10 update

    * src/inst-sections.nsi: Use unique labels
    * src/uninst-kleopatra.nsi: Close a quote

6 years agoRemove help:/ prefix in kleopatra documentation
Andre Heinecke [Mon, 29 Apr 2013 17:03:23 +0000 (17:03 +0000)]
Remove help:/ prefix in kleopatra documentation

    As we do not package khelpcenter we use the file links
    in the doc

    * src/Makefile.am: Add postinst for kleopatra to fix help links

6 years agoUpdate kleopatra packaging for KDE 4.10
Andre Heinecke [Mon, 29 Apr 2013 17:01:01 +0000 (17:01 +0000)]
Update kleopatra packaging for KDE 4.10

    * packages/packages.current: Use repackaged kleopatra version
    with some additional files and exploded documentation.
    * src/inst-kleopatra.nsi, src/uninst-kleopatra: Handle updated
    paths and filenames.

6 years agoDisable all Claws related packages.
Werner Koch [Mon, 29 Apr 2013 12:09:57 +0000 (14:09 +0200)]
Disable all Claws related packages.

--

Claws currently uses its own installer.  We need to see how to get it
back into gpg4win.

6 years agoRe-enable packages using curl.
Werner Koch [Mon, 29 Apr 2013 12:08:22 +0000 (14:08 +0200)]
Re-enable packages using curl.

* configure.ac: Uncomment curl related packages.
--

It was a stupid idea to comment out tye curl packages in configure.ac.
The correct way to do this is only in packages.current.

(reverts commit 458e026e)

6 years agoAdd repackaged dbus-bin and update packaging
Andre Heinecke [Mon, 29 Apr 2013 11:15:22 +0000 (11:15 +0000)]
Add repackaged dbus-bin and update packaging

    This package contains a libexpat.dll from expat 2.0.1
    as it was linked against this name.

    * src/inst-dbus.nsi, src/uninst-dbus.nsi: Fix etc paths, remove
    libexpatw.dll

--
    The best solution for the libexpat workaround is to build
    dbus together with the rest of gpg4win and not include it as
    binary. This should be easy as windows is a supported dbus
    platform and has a autotools buildsystem.

6 years agoMerge branch 'master'
Andre Heinecke [Mon, 29 Apr 2013 11:05:45 +0000 (11:05 +0000)]
Merge branch 'master'

6 years agoFix oxygen-icon filenames
Andre Heinecke [Mon, 29 Apr 2013 10:10:52 +0000 (10:10 +0000)]
Fix oxygen-icon filenames

    This adds a -bin suffix to the binary package and
    remvoes the -kde- part so that it is in line with
    the other package names.

    * packages/packages.current: Update oxygen-icons filenames.

6 years agoAdd qt and oxygen-icons dependencies for kleopatra
Andre Heinecke [Mon, 29 Apr 2013 09:51:37 +0000 (09:51 +0000)]
Add qt and oxygen-icons dependencies for kleopatra

    Previously kdelibs depended on them.

    configure.ac: Add dependency to qt and oxygen-icons to kleopatra

6 years agoOnly package dbus in inst-dbus.nsi
Andre Heinecke [Mon, 29 Apr 2013 09:46:47 +0000 (09:46 +0000)]
Only package dbus in inst-dbus.nsi

    This removes the old kdesupport packaging artifacts.

    * src/inst-dbus.nsi, src/uninist-dbus.nsi: Only package dbus

6 years agognupg: Scdaemon is now in libexec.
Werner Koch [Mon, 29 Apr 2013 09:40:14 +0000 (11:40 +0200)]
gnupg: Scdaemon is now in libexec.

* src/inst-gnupg2.nsi: Install sdaemon from libexec.

6 years agoUpdate oxygen-icons to KDE 4.10
Andre Heinecke [Mon, 29 Apr 2013 08:44:34 +0000 (08:44 +0000)]
Update oxygen-icons to KDE 4.10

    This package consists of the same files as the old package
    but in a newer and more shiny Version.

    * packages/packages.current: Update oxygen icons.

6 years agoRemove dependency on removed package.
Werner Koch [Mon, 29 Apr 2013 08:43:47 +0000 (10:43 +0200)]
Remove dependency on removed package.

* configure.ac: Remove kdelibs dependency from kleopatra.

6 years agoAdd w64-mingw32 compatibility patches.
Werner Koch [Mon, 29 Apr 2013 08:18:59 +0000 (10:18 +0200)]
Add w64-mingw32 compatibility patches.

* patches/gpgme-1.4.0/01-off_t.postcfg-build:  New.
* patches/gpgol-1.1.3/01-w64-ming64.patch:  New.
* Makefile.am (EXTRA_DIST): Add them.

6 years agoProvide a hook for patches after a configure run.
Werner Koch [Mon, 29 Apr 2013 08:17:38 +0000 (10:17 +0200)]
Provide a hook for patches after a configure run.

* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Add an extra
patch stage.
--

In general this is not a good idea, but sometimes it saves a lot of
time and allows for a hotfix.  Note that there are two different
suffixes, depending on whether to patch in the source of the build
directory.

6 years agoGnutls-openssl is now so version 27
Andre Heinecke [Mon, 29 Apr 2013 07:28:08 +0000 (07:28 +0000)]
Gnutls-openssl is now so version 27

    * src/inst-gnutls.nsi, src/uninst-gnutls.nsi: Update file name
    to libgnutls-openssl-27.dll

6 years agoRemove translations for qt tools.
Andre Heinecke [Fri, 26 Apr 2013 17:37:10 +0000 (17:37 +0000)]
Remove translations for qt tools.

    Those have nothing to do with kleopatra and are not used.

    * inst-qt.nsi, uninst-qt.nsi: Remove translations

6 years agoUpdate kleopatra binary package
Andre Heinecke [Fri, 26 Apr 2013 17:32:20 +0000 (17:32 +0000)]
Update kleopatra binary package

    The old package accidentally contained some uneccessary
    libraries.

    * packages/packages.current: Update kleopatra binary package

6 years agoUopdate nsis configuration for kdesupport kdelibs
Andre Heinecke [Fri, 26 Apr 2013 17:28:38 +0000 (17:28 +0000)]
Uopdate nsis configuration for kdesupport kdelibs

    * include/config.nsi.in: Rename kdesupport to dbus. Remove kdelibs

6 years agoFix filename of pinentry-0.8.3
Andre Heinecke [Fri, 26 Apr 2013 16:30:44 +0000 (16:30 +0000)]
Fix filename of pinentry-0.8.3

    Pinentry is now distributed as a bziped archive.

    * src/packages.current: Change pinentry from tar.gz to tar.bz2

6 years agoUpdate kleopatra and qt
Andre Heinecke [Fri, 26 Apr 2013 16:22:46 +0000 (16:22 +0000)]
Update kleopatra and qt

    Kleopatra is now from KDE 4.10.2

    * src/packages.current: Update Kleopatra, Qt and remove kdelibs

6 years agoCombine kdelibs and kleopatra package
Andre Heinecke [Fri, 26 Apr 2013 15:53:22 +0000 (15:53 +0000)]
Combine kdelibs and kleopatra package

    * Makefile.am: Remove kdelibs package.
    * gpg4win.nsi: Update section management for kdelibs and dbus.
    * inst-kleopatra, uninst-kleopatra: Add parts from kdelibs.
    * uninst-kdelibs, inst-kdelibs: Removed.

--
    A combined package is easier to handle from the KDE side of things
    as the previous distinction was unclear. Kdelibs for example
    contained also the localization and some parts of kde-runtime.
    The Kleopatra package now should contain everything in Gpg4Win that
    is maintained by KDE.

6 years agoOnly package parts of Qt that are actually used.
Andre Heinecke [Fri, 26 Apr 2013 15:48:50 +0000 (15:48 +0000)]
Only package parts of Qt that are actually used.

    * src/inst-qt.nsi, src/uninst-qt.nsi: Remove uneccessary Qt parts

6 years agoRemove mingwm10 this is no longer neccessary
Andre Heinecke [Fri, 26 Apr 2013 15:46:16 +0000 (15:46 +0000)]
Remove mingwm10 this is no longer neccessary

    Qt no longer depends on mingwm10.dll so it is uneccessary to
    package it.

    * configure.ac: Remove mingwm10.dll handling

6 years agoMake Qt depend on dbus instead of kdesupport
Andre Heinecke [Fri, 26 Apr 2013 15:45:03 +0000 (15:45 +0000)]
Make Qt depend on dbus instead of kdesupport

    * configure.ac: Remove dependency to kdesupport and add dbus

6 years agoUpdate buildsystem for qt and dbus
Andre Heinecke [Fri, 26 Apr 2013 10:04:17 +0000 (10:04 +0000)]
Update buildsystem for qt and dbus

    Kdesupport is replaced by a dbus only package. Qt is updated
    so the Pkgconfig files have to be updated accordingly.

    * src/QtCore.pc, src/QtGui.pc: Update to qt 4.8.4
    * src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Renamed to
    dbus.
    * src/Makefile.am: Remove workarounds for the kdesupport package
    that are no longer neccessary.

6 years agoUpdate qt to 4.8.4
Andre Heinecke [Thu, 18 Apr 2013 13:25:10 +0000 (13:25 +0000)]
Update qt to 4.8.4

    This update brings 4 years of qt development and new styles
    like Aero style to improve the look and feel of kleopatra
    on modern Windows Systems. This update should resolve a
    lot of bugs in kleopatra that were already fixed upstream.
(cherry picked from commit 2f0dc549e8c2b154cb9c7d3eeb71d676fa3b333b)

6 years agoUpdate dbus from dbus to freedesktop dbus 1.4.24
Andre Heinecke [Thu, 18 Apr 2013 13:18:43 +0000 (13:18 +0000)]
Update dbus from dbus to freedesktop dbus 1.4.24

    This should greatly improve stability and performance
    of dbus for windows. Other windows specific improvements
    include better multiuser support and a seperation of multiple
    dbus instances based on their installation location.
    This will also allow it to have two different versions of kleopatra
    running.
    It is also a depedency for newer qt and kde versions.
(cherry picked from commit 9e4fe24b99aa4f39df8d1d61c65be2f9f05e77b7)

6 years agoUpdate pinentry to version 0.8.3.
Werner Koch [Fri, 26 Apr 2013 15:53:55 +0000 (17:53 +0200)]
Update pinentry to version 0.8.3.

6 years agoForce building pinentry-qt4 for a full installer.
Werner Koch [Fri, 26 Apr 2013 10:39:31 +0000 (12:39 +0200)]
Force building pinentry-qt4 for a full installer.

* src/Makefile.am (pinentry_enable_disable): New.

6 years agoTemporary disable packages using curl.
Werner Koch [Fri, 26 Apr 2013 10:34:21 +0000 (12:34 +0200)]
Temporary disable packages using curl.

6 years agoUpdate dirmngr to version 1.1.1.
Werner Koch [Fri, 26 Apr 2013 09:25:51 +0000 (11:25 +0200)]
Update dirmngr to version 1.1.1.

6 years agoFix building of GNUTLS and update to latest 2.x version.
Werner Koch [Thu, 25 Apr 2013 15:54:45 +0000 (17:54 +0200)]
Fix building of GNUTLS and update to latest 2.x version.

* patches/gnutls-2.12.21/01-openssl-wincrypt.patch: New.
* Makefile.am: Add patch.
* src/Makefile.am (gpg4win_pkg_gnutls_configure): Force building with
libgcrypt.  Disable pkcs11 module.
(LTLIBTASN1):
(gpg4win_pkg_gnutls_make_args): Add hack to allow building latest
version.
--

gnutls 2.12.21 does not seem to be well tested with Windows.  At least
not with w64-mingw32.  This is a minimal fix which is not guarnteed to
always work.

6 years agoglib: Use the installed toolchain also for CXX.
Werner Koch [Wed, 24 Apr 2013 19:18:21 +0000 (21:18 +0200)]
glib: Use the installed toolchain also for CXX.

* src/Makefile.am (gpg4win_pkg_glib_configure): Replace hardwired CCC
value.  This is a cosmetic change CCC is only used by regression
tests.

6 years agozlib: Use the installed toolchain.
Werner Koch [Wed, 24 Apr 2013 19:09:37 +0000 (21:09 +0200)]
zlib: Use the installed toolchain.

* src/Makefile.am (gpg4win_pkg_zlib_make_args): Repalce hardwired
prefix by $(host).

6 years agopthreads-w32: Add patch for newer mingw-w64 versions
Andre Heinecke [Thu, 18 Apr 2013 16:46:05 +0000 (16:46 +0000)]
pthreads-w32: Add patch for newer mingw-w64 versions

* Makefile.am: Add patch to EXTRA_DIST
* patches/pthreads-w32-2-8-0-release: Add
02-mingw_w64_timespec_compatibility.patch
--
The mingw-w64 header included in debian sid define timespec in time.h
for windows. As pthread has not a configurable build system we check
for a definition made by the header instead of checking for the
struct.

(cherry picked from commit 3e813b391bf77b91b4492aafc5c8f136a60d535f)

6 years agoA first set of patch to allow the use of i686-w64-mingw32.
Werner Koch [Wed, 24 Apr 2013 18:57:17 +0000 (20:57 +0200)]
A first set of patch to allow the use of i686-w64-mingw32.

* autogen.sh <build-w32>: Prefer the i686-w64-mingw32 toolchain.

* src/Makefile.am (gpg4win_pkg_crypt_make): Rename to
gpg4win_pkg_crypt_make_args to make it actually work.

* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Use host and
build instead host_cpu+host_os.

6 years agoUpdate most ftp.gnupg.org packages.
Werner Koch [Tue, 23 Apr 2013 08:08:00 +0000 (10:08 +0200)]
Update most ftp.gnupg.org packages.

--

6 years agoFix Kleopatra file names and update readmes.
Werner Koch [Sun, 9 Dec 2012 21:40:12 +0000 (22:40 +0100)]
Fix Kleopatra file names and update readmes.

--