[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.3-54-g48725b2
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Apr 12 13:14:00 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 48725b2835b6a8c9ddab0258c7d9c271230f62ec (commit)
via 704e5078c7e85139ec38a41a949a79be83d9384e (commit)
via 0bf74ec0b0b8f79a13ff66f94f41797cb549c043 (commit)
via 99bb5b55170f6cc6c85200c804c20577e36d12c2 (commit)
via 4b6ed8bb18000ad7015c9737c5ce74515c671a10 (commit)
from f5a1565d0e40cf9fc1a5990452d46eaed186fb27 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 48725b2835b6a8c9ddab0258c7d9c271230f62ec
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 13:13:34 2018 +0200
Switch gpgol to released 2.1.0
* packages/packages.current (gpgol): Use 2.1.0.
diff --git a/packages/packages.current b/packages/packages.current
index a31b8a1..990e20c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -235,17 +235,17 @@ chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
#
server http://files.gpg4win.org/src
-# last-changed: 2018-01-12
+# last-changed: 2018-04-12
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
-# file gpgol/gpgol-2.0.7-beta67.tar.bz2
-# chk ca394cbcb404cccf92e1cf02a7c96a62b96873cd85d5d8144c0844f82611059b
+file gpgol/gpgol-2.1.0.tar.bz2
+chk 3193fc5c85f7ef8cddca97c537831daf7a51f56c244f3d33ce2c3fcc01437764
# for beta
-server http://files.intevation.de/projects/gpg4all
+#server http://files.intevation.de/projects/gpg4all
-file gpgol/gpgol-2.1.0-beta132.tar.bz2
-chk bd75e70c23be56e8faee528f366c6efa2e267379fc528c55a16ed0f1748c947c
+#file gpgol/gpgol-2.1.0-beta132.tar.bz2
+#chk bd75e70c23be56e8faee528f366c6efa2e267379fc528c55a16ed0f1748c947c
#
# GpgEX
commit 704e5078c7e85139ec38a41a949a79be83d9384e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 10:58:40 2018 +0200
Add Kcrash as a new package
* README: Update some notes.
* configure.ac, packages/gen-frameworks.sh,
packages/packages.current, src/Makefile.am,
src/config.nsi.in, src/inst-sections.nsi: Add kcrash.
* src/inst-kcrash.nsi, src/uninst-kcrash.nsi: New.
--
Kleopatra has a dependency on this. While it might not
be useful for us yet maybe we can make it more useful
in the future. It's very simple to package.
diff --git a/README b/README
index 9b63ebf..a520fdc 100644
--- a/README
+++ b/README
@@ -77,7 +77,7 @@ Adding new packages to the installer:
This requires editing a couple of files; we might eventually automate
some of these tasks. Here is a short run up:
-1. Add constants for the package FOO into include/config.nsi.in .
+1. Add constants for the package FOO into src/config.nsi.in .
2. Create 2 new installer scripts, named src/inst-foo.nsi and
uninst-foo.nsi and add them to EXTRA_DIST in src/Makefile.am.
@@ -87,7 +87,7 @@ some of these tasks. Here is a short run up:
gpg4win) in src/Makefile.am . Also add any required configure
flags etc.
-4. Add FOO to inst-sections.nsi.
+4. Add FOO to src/inst-sections.nsi.
5. Add detection of packages to configure.ac. Check out the available
macros in m4/gpg4win.m4. Depending on the way an upstream package
diff --git a/configure.ac b/configure.ac
index 26ab5d2..bbacba1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,6 +363,7 @@ GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfi
GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
GPG4WIN_KDEPKG([kitemmodels], [qtbase qttools])
GPG4WIN_KDEPKG([karchive], [qtbase qttools extra-cmake-modules])
+GPG4WIN_KDEPKG([kcrash], [kwindowsystem kcoreaddons])
GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets karchive])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
diff --git a/packages/gen-frameworks.sh b/packages/gen-frameworks.sh
index 8afc7da..1037e34 100755
--- a/packages/gen-frameworks.sh
+++ b/packages/gen-frameworks.sh
@@ -44,7 +44,8 @@ FRAMEWORKS="extra-cmake-modules
kitemmodels
kiconthemes
breeze-icons
- karchive"
+ karchive
+ kcrash"
tmpdir=$(mktemp -d)
diff --git a/packages/packages.current b/packages/packages.current
index 603a85f..a31b8a1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -511,6 +511,14 @@ chk 3eda58a4c7c9369fe9b246500d88a964d3411f83e1113727ed723989d935dea7
# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
file 5.43/karchive-5.43.0.tar.xz
chk 0e639a2818700220bf20aea83a00697b385d67f39eba5840b400d8d72ec477b8
+
+# kcrash
+# last changed: 2018-02-27
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcrash-5.43.0.tar.xz
+chk 2b74ab0d0d393c32a7e53e16757763fbe91d25e8dd157e860dec45a047866ec3
+
##### End Paste #####
# KDE Applications
diff --git a/src/Makefile.am b/src/Makefile.am
index 6138c89..ec7e208 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kiconthemes.nsi uninst-kiconthemes.nsi \
inst-breeze-icons.nsi uninst-breeze-icons.nsi \
inst-karchive.nsi uninst-karchive.nsi \
+ inst-kcrash.nsi uninst-kcrash.nsi \
inst-kitemviews.nsi uninst-kitemviews.nsi \
inst-kitemmodels.nsi uninst-kitemmodels.nsi \
inst-kguiaddons.nsi uninst-kguiaddons.nsi \
@@ -123,7 +124,7 @@ gpg4win_kdepkgs = kconfig kwidgetsaddons ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
kiconthemes kleopatra breeze-icons kitemmodels karchive \
- gpg4win-tools
+ gpg4win-tools kcrash
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index d1fff45..f898ab9 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -282,6 +282,10 @@
!define gpg4win_pkg_karchive @gpg4win_pkg_karchive@
!define gpg4win_pkg_karchive_version @gpg4win_pkg_karchive_version@
+ at HAVE_PKG_KCRASH@
+!define gpg4win_pkg_kcrash @gpg4win_pkg_karchive@
+!define gpg4win_pkg_kcrash_version @gpg4win_pkg_karchive_version@
+
@HAVE_PKG_GPG4WIN_TOOLS@
!define gpg4win_pkg_gpg4win_tools @gpg4win_pkg_gpg4win_tools@
!define gpg4win_pkg_gpg4win_tools_version @gpg4win_pkg_gpg4win_tools_version@
diff --git a/src/inst-kcrash.nsi b/src/inst-kcrash.nsi
new file mode 100644
index 0000000..f9d8ea9
--- /dev/null
+++ b/src/inst-kcrash.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2018 Intevation GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kcrash-${gpg4win_pkg_kcrash_version}
+
+!ifdef DEBUG
+Section "kcrash" SEC_kcrash
+!else
+Section "-kcrash" SEC_kcrash
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kcrash}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5Crash.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 429d6b5..7565154 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -149,6 +149,9 @@
!ifdef HAVE_PKG_KARCHIVE
!include "inst-karchive.nsi"
!endif
+!ifdef HAVE_PKG_KCRASH
+!include "inst-kcrash.nsi"
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!include "inst-kitemviews.nsi"
!endif
@@ -371,6 +374,9 @@
!ifdef HAVE_PKG_KARCHIVE
!include "uninst-karchive.nsi"
!endif
+!ifdef HAVE_PKG_KCRASH
+!include "uninst-kcrash.nsi"
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!include "uninst-kitemviews.nsi"
!endif
@@ -660,6 +666,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KARCHIVE
!insertmacro UnselectSection ${SEC_karchive}
!endif
+!ifdef HAVE_PKG_KCRASH
+ !insertmacro UnselectSection ${SEC_kcrash}
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!insertmacro UnselectSection ${SEC_kitemviews}
!endif
@@ -798,6 +807,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_kitemmodels}
!insertmacro SelectSection ${SEC_kiconthemes}
!insertmacro SelectSection ${SEC_karchive}
+ !insertmacro SelectSection ${SEC_kcrash}
!insertmacro SelectSection ${SEC_kguiaddons}
!insertmacro SelectSection ${SEC_qtsvg}
!insertmacro SelectSection ${SEC_qttranslations}
diff --git a/src/uninst-kcrash.nsi b/src/uninst-kcrash.nsi
new file mode 100644
index 0000000..2bad88e
--- /dev/null
+++ b/src/uninst-kcrash.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2018 Intevation GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kcrash-${gpg4win_pkg_kcrash_version}
+
+; Uninstaller section.
+Section "-un.kcrash"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kcrash}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5Crash.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
commit 0bf74ec0b0b8f79a13ff66f94f41797cb549c043
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 10:32:09 2018 +0200
Update NEWS and READMEs
--
diff --git a/NEWS b/NEWS
index 1a3b69b..739afc8 100644
--- a/NEWS
+++ b/NEWS
@@ -43,10 +43,10 @@ Noteworthy changes in Version 3.1.0 (unreleased)
Appdata Verzeichnis auf einen UNC Pfad gelegt wurde. (T3818)
(en) Kleopatra: Multiple minor improvements.
- (T3845 T3846 T3776 T3723 T3849 T3850)
+ (T3845 T3846 T3776 T3723 T3849 T3850 T3865 T3868)
(de) Kleopatra: Verschiedene kleinere Verbesserungen.
- (T3845 T3846 T3776 T3723 T3849 T3850)
+ (T3845 T3846 T3776 T3723 T3849 T3850 T3865 T3868)
(en) GpgOL: Cryptographic functions are now called directly from GpgOL,
without using Kleopatra. This fixes several problems caused by
@@ -81,9 +81,11 @@ Noteworthy changes in Version 3.1.0 (unreleased)
(de) GpgOL: Grundlegende Unterstützung für das "Web Key Publishing" wurde
hinzugefügt. (T3785)
-(en) GpgOL: Additional mail types are now supported when reading. (T3802)
+(en) GpgOL: Additional mail types are now supported when reading.
+ (T3802 T3882)
-(de) GpgOL: Weitere Mail-Typen werden beim nun beim Lesen unterstützt. (T3802)
+(de) GpgOL: Weitere Mail-Typen werden beim nun beim Lesen unterstützt.
+ (T3802 T3882)
(en) GpgOL: The handling of Exchange Mail addresses was improved. (T3082)
@@ -107,21 +109,45 @@ Noteworthy changes in Version 3.1.0 (unreleased)
(de) GpgOL: Das weiterleiten von verschlüsselten / signieren Mails mit
Anhängen wird nun unterstützt. (T3836)
-(en) GnuPG: Updated to version 2.2.5.
+(en) GpgOL: S/MIME is supported again with the last version of Exchange
+ 2016. (T3853)
-(de) GnuPG: Auf Version 2.2.5 aktualisiert.
+(de) GpgOL: S/MIME wird nun auch wieder für die aktuellste Exchange 2016
+ Version unterstützt. (T3853)
+(en) GpgOL: Re-Sending crypto mails is now supported. (T3884)
+
+(de) GpgOL: Das erneute senden von Krypto Mails wird nun unterstützt. (T3884)
+
+(en) GpgOL: A problem that could lead to strange numbering of attachments
+ was resolved. (T3886)
+
+(de) GpgOL: Ein Problem das dazu führen konnte das Anhänge merkwürdig
+ nummeriert wurden ist behoben. (T3886)
+
+(en) GnuPG: A rare problem that could lead to "General Error" messages
+ after a fresh install of Gpg4win has been fixed. (T3839)
+
+(de) GnuPG: Ein seltenes Problem das nach einer frischen installation
+ zu "Allgemeiner Fehler" meldungen führen konnte ist behoben. (T3839)
+
+(en) GnuPG: Updated to version 2.2.6.
+ (See: https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000421.html )
+
+(de) GnuPG: Auf Version 2.2.6 aktualisiert.
+ (Siehe: https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000421.html )
~~~~~~~~~~~~~~~
-GnuPG: 2.2.5
+GnuPG: 2.2.6
Kleopatra: 3.1.0
GPA: 0.9.10
GpgOL: 2.1.0
-GpgEX: 1.0.5
-Kompendium DE: 4.0.0
+GpgEX: 1.0.6
+Kompendium DE: 4.0.1
Compendium EN: 3.0.0
~~~~~~~~~~~~~~~
+
Noteworthy changes in Version 3.0.3 (2018-01-12)
------------------------------------------------
diff --git a/doc/README.de.txt b/doc/README.de.txt
index a554169..ecd9613 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -84,7 +84,7 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
Appdata Verzeichnis auf einen UNC Pfad gelegt wurde. (T3818)
- Kleopatra: Verschiedene kleinere Verbesserungen.
- (T3845 T3846 T3776 T3723 T3849 T3850)
+ (T3845 T3846 T3776 T3723 T3849 T3850 T3865 T3868)
- GpgOL: Kryptographische Funktionen werden nun direkt durch GpgOL
aufgerufen, ohne Kleopatra zu verwenden. Dies behebt eine Reihe
@@ -104,7 +104,8 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Grundlegende Unterstützung für das "Web Key Publishing" wurde
hinzugefügt. (T3785)
-- GpgOL: Weitere Mail-Typen werden beim nun beim Lesen unterstützt. (T3802)
+- GpgOL: Weitere Mail-Typen werden beim nun beim Lesen unterstützt.
+ (T3802 T3882)
- GpgOL: Die Handhabung von Exchange Mail-Adressen wurde verbessert. (T3802)
@@ -117,8 +118,19 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Das weiterleiten von verschlüsselten / signieren Mails mit
Anhängen wird nun unterstützt. (T3836)
-- GnuPG: Auf Version 2.2.5 aktualisiert.
+- GpgOL: S/MIME wird nun auch wieder für die aktuellste Exchange 2016
+ Version unterstützt. (T3853)
+- GpgOL: Das erneute senden von Krypto Mails wird nun unterstützt. (T3884)
+
+- GpgOL: Ein Problem das dazu führen konnte das Anhänge merkwürdig
+ nummeriert wurden ist behoben. (T3886)
+
+- GnuPG: Ein seltenes Problem das nach einer frischen installation
+ zu "Allgemeiner Fehler" meldungen führen konnte ist behoben. (T3839)
+
+- GnuPG: Auf Version 2.2.6 aktualisiert.
+ (Siehe: https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000421.html )
3. Anmerkungen
==============
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 230cadb..f939d58 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -81,7 +81,7 @@ New in Gpg4win version !VERSION! (!BUILD_ISODATE!)
Appdata directory was redirected to an UNC path. (T3818)
- Kleopatra: Multiple minor improvements.
- (T3845 T3846 T3776 T3723 T3849 T3850)
+ (T3845 T3846 T3776 T3723 T3849 T3850 T3865 T3868)
- GpgOL: Cryptographic functions are now called directly from GpgOL,
without using Kleopatra. This fixes several problems caused by
@@ -98,7 +98,8 @@ New in Gpg4win version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Basic support for Web Key publishing has been added. (T3785)
-- GpgOL: Additional mail types are now supported when reading. (T3802)
+- GpgOL: Additional mail types are now supported when reading.
+ (T3802 T3882)
- GpgOL: The handling of Exchange Mail addresses was improved. (T3082)
@@ -111,8 +112,19 @@ New in Gpg4win version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Forwarding of encrypted / signed mails with attachments
is now supported. (T3836)
-- GnuPG: Updated to version 2.2.5.
+- GpgOL: S/MIME is supported again with the last version of Exchange
+ 2016. (T3853)
+- GpgOL: Re-Sending crypto mails is now supported. (T3884)
+
+- GpgOL: A problem that could lead to strange numbering of attachments
+ was resolved. (T3886)
+
+- GnuPG: A rare problem that could lead to "General Error" messages
+ after a fresh install of Gpg4win has been fixed. (T3839)
+
+- GnuPG: Updated to version 2.2.6.
+ (See: https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000421.html )
3. Additional notes
===================
commit 99bb5b55170f6cc6c85200c804c20577e36d12c2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 09:58:27 2018 +0200
Update master packages to latest snapshots
--
diff --git a/packages/packages.current b/packages/packages.current
index e0951a9..603a85f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -244,8 +244,8 @@ server http://files.gpg4win.org/src
# for beta
server http://files.intevation.de/projects/gpg4all
-file gpgol/gpgol-2.1.0-beta121.tar.bz2
-chk 4b2a8f3fd59fc3e58a7a9516f043892fd26ffecefe7af7fbeeed0f83b08a0279
+file gpgol/gpgol-2.1.0-beta132.tar.bz2
+chk bd75e70c23be56e8faee528f366c6efa2e267379fc528c55a16ed0f1748c947c
#
# GpgEX
@@ -535,8 +535,8 @@ file pinentry/pinentry-1.1.1-beta5.tar.bz2
chk 7bda3fef7d7f0f77dd4dfe11e3364c64f1e9646945afa995da8a5084ce59e101
# by: ah
-file gpgme/gpgme-1.10.1-beta183.tar.bz2
-chk 89d6696ce5cc513de2fc42972411df94eb4e6d8c77b579634dc3737e274bac51
+file gpgme/gpgme-1.10.1-beta184.tar.bz2
+chk 40b8d37673d5da5cb3bbd296c454562e0ec6f13de41171dd5907bcfef16c2d08
# Libkleo
# last changed: see package date.
@@ -549,11 +549,11 @@ chk caa04fd3fee76d772f4186df8ab358e59ed95d16556679326101d32335f7b63e
# last changed: see package date.
# by: ah
# verified: Tarball created by ah with script kde-l10n.sh
-file kde-l10n/kde-l10n-201803291031-bin.tar.xz
-chk 52dd0f20ec77926f1277bb5f6e51dcd9029860292a2d65b10591c87ff9e4f616
+file kde-l10n/kde-l10n-201804120931-bin.tar.xz
+chk a0746bdbc7013e528758161396f6ab1b69aaeafea8b44cc2e2e61efc5bb0d8a2
-file kde-l10n/kde-l10n-201803291031-src.tar.xz
-chk 823109f95d5f8f69835fcff35a1a6e415f626a8841cd88284203ff9b8bdeb702
+file kde-l10n/kde-l10n-201804120931-src.tar.xz
+chk 83d37e092c0a8e77e8726babdf8603f2f2d5b97d497ff14a7e60e2b1d5bde494
# Gpg4win-tools package (experimental)
# last changed: see package date.
@@ -566,5 +566,5 @@ chk 6c6f017063aa30679e4620d354b3281fe4adff45515d518ecc297a0d98416099
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201804051220.tar.gz
-chk 6e815e0dfd88bd373e838124591a8422e9ebd2131a5db111e4d17e6e2d4cb4fb
+file kleopatra/kleopatra-201804120927.tar.gz
+chk d5c07ad9bba3fded6b40eabf2cc76a64041106c386895555c7a60414adeac56b
commit 4b6ed8bb18000ad7015c9737c5ce74515c671a10
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 09:14:55 2018 +0200
Update gnupg, libgpg-error, libkleo
* Makefile.am (EXTRA_DIST): Remove obsolete patches.
* packages/packages.current: Update.
* patches/: Remove gpgex and libgpg-error patches
--
This also fixes the checksum for gpgex which was taken
from the swdb.lst
diff --git a/Makefile.am b/Makefile.am
index 53bdf5b..5e4e822 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,9 +44,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/fix-qt5.6-build.patch \
- patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch \
- patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
- patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
diff --git a/packages/packages.current b/packages/packages.current
index 3a55d41..e0951a9 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -256,7 +256,7 @@ server http://files.gpg4win.org/src
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
file gpgex/gpgex-1.0.6.tar.bz2
-chk 8cb429bfcf1e938fa4ef8953e0eb2eff88848d883afcf66fdf5fa67ef01ed424
+chk d69898d1022400bd09bb684080edc95be554af736ae9c014df73543f34f7481b
#
# Pth emulation
@@ -286,25 +286,25 @@ chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
-# last-changed: 2018-03-15
+# last-changed: 2018-04-12
# by: ah
-file libgpg-error/libgpg-error-1.28.tar.bz2
-chk 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49
+file libgpg-error/libgpg-error-1.29.tar.bz2
+chk ece926fa5719d17a7ad8da618712cfa2f8a796ab2f2af9d544c5bb093383b1ea
# last-changed: 2017-12-07
# by: ah
file libassuan/libassuan-2.5.1.tar.bz2
chk 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
-# last changed: 2018-03-06
+# last changed: 2018-04-12
# by: ah
-name gnupg-w32-2.2.5-20180222-bin.exe
-file binary/gnupg-w32-2.2.5_20180222.exe
-chk 9fea4add738a373b3c1a304f74eec2d24a8f5fe7ccdf1d8ee090d99de8f51257
+name gnupg-w32-2.2.6-20180409-bin.exe
+file binary/gnupg-w32-2.2.6_20180409.exe
+chk 5d426b19d9cc3d7d3c0db0dfb58af1b6a36f4ea1cfd55901bb6864e865fcccc6
-name gnupg-w32-2.2.5-20180222-src.tar.xz
-file binary/gnupg-w32-2.2.5_20180222.tar.xz
-chk 9afdeb9790aaa5b55bca44b837efbe971eeea19dc40a78ff53c62de0f3e9e10a
+name gnupg-w32-2.2.6-20180409-src.tar.xz
+file binary/gnupg-w32-2.2.6_20180409.tar.xz
+chk 559262de070e3b58dd031ce6becc164147009c3676fb8155bcb693ed26db8556
# TODO back to stable
# last changed: 2017-12-05
@@ -542,8 +542,8 @@ chk 89d6696ce5cc513de2fc42972411df94eb4e6d8c77b579634dc3737e274bac51
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file libkleo/libkleo-201804051435.tar.gz
-chk 7367201211e9f2026cf42370ab9445c3ce40ae53b888c46735878e493cd2eac0
+file libkleo/libkleo-201804120859.tar.gz
+chk caa04fd3fee76d772f4186df8ab358e59ed95d16556679326101d32335f7b63e
# KDE-L10n
# last changed: see package date.
diff --git a/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch b/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
deleted file mode 100755
index 9052ed3..0000000
--- a/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Tue, 28 Jun 2016 11:00:53 +0200
-Subject: [PATCH] Prefer kleowrapped / gpgwrapped binaries
-
-* src/client.cc (default_uiserver_cmdline): Prefer non "bin" prefixed
-paths.
-
---
-With Gpg4win-2.x we need to start the "wrapped" binaries if they
-don't exist we are probably in gpg4win-3.x and can fall back to
-the binaries in the bin subdirectory.
----
- src/client.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/client.cc b/src/client.cc
-index ebf82a8..6f27175 100644
---- a/src/client.cc
-+++ b/src/client.cc
-@@ -111,12 +111,12 @@ default_uiserver_cmdline (void)
- const char *dir, *tmp;
- char *uiserver, *p;
- int extra_arglen = 9;
-- const char * server_names[] = {"bin\\kleopatra.exe",
-- "kleopatra.exe",
-- "bin\\launch-gpa.exe",
-+ const char * server_names[] = {"kleopatra.exe",
-+ "bin\\kleopatra.exe",
- "launch-gpa.exe",
-- "bin\\gpa.exe",
-+ "bin\\launch-gpa.exe",
- "gpa.exe",
-+ "bin\\gpa.exe",
- NULL};
-
- dir = gpgex_server::root_dir;
---
-2.1.4
diff --git a/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch b/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
deleted file mode 100755
index 66d2484..0000000
--- a/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 3dddfb2546b839e104286767f504e456ae91df45 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 11 Aug 2016 15:45:49 +0200
-Subject: [PATCH] Fix loop logic error in new server name detection
-
-* src/client.cc (default_uiserver_cmdline): Iterate over server_names
-array and not over the first server name itself.
----
- src/client.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/client.cc b/src/client.cc
-index 6f27175..ccfa0ac 100644
---- a/src/client.cc
-+++ b/src/client.cc
-@@ -108,7 +108,7 @@ default_uiserver_cmdline (void)
- }
- #else /*!ENABLE_GPA_ONLY*/
- {
-- const char *dir, *tmp;
-+ const char *dir, **tmp;
- char *uiserver, *p;
- int extra_arglen = 9;
- const char * server_names[] = {"kleopatra.exe",
-@@ -163,16 +163,16 @@ default_uiserver_cmdline (void)
- return name;
- }
- /* Fallbacks */
-- for (tmp = *server_names; *tmp; tmp++)
-+ for (tmp = server_names; *tmp; tmp++)
- {
- if (name)
- {
- free (name);
- }
-- name = (char*) malloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
-+ name = (char*) malloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
- if (!name)
- return NULL;
-- strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
-+ strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
- for (p = name; *p; p++)
- if (*p == '/')
- *p = '\\';
---
-2.1.4
diff --git a/patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch b/patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch
deleted file mode 100755
index 553ea4b..0000000
--- a/patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From c36a60687976d98b54dac17f699dfca4918a737c Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Wed, 14 Mar 2018 10:07:42 +0100
-Subject: [PATCH Libgpg-error] core: Fix building on W64
-
-* src/w32-add.h: Remove hack to define pid_t.
-* src/gpg-error.h.in: Eval macro to define pid_t.
-* src/mkheader.c (have_sys_types_h, sys_types_h_included): New.
-(parse_config_h): Test for sys/types.h.
-(write_special): Protect inclusion of sys/types.h. Define new macro
-'define:pid_t'.
---
-
-Regression-due-to: 1865c0ba1769b407a3c504f1ab0a4278704a9fc1
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- src/gpg-error.h.in | 1 +
- src/mkheader.c | 36 ++++++++++++++++++++++++++++++++++--
- src/w32-add.h | 4 ----
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
-index f942098..cc2e361 100644
---- a/src/gpg-error.h.in
-+++ b/src/gpg-error.h.in
-@@ -405,6 +405,7 @@ const char *gpgrt_check_version (const char *req_version);
- const char *gpg_error_check_version (const char *req_version);
-
- /* System specific type definitions. */
-+ at define:pid_t@
- @define:gpgrt_ssize_t@
- @define:gpgrt_off_t@
-
-diff --git a/src/mkheader.c b/src/mkheader.c
-index 997cab5..2fc5fad 100644
---- a/src/mkheader.c
-+++ b/src/mkheader.c
-@@ -30,6 +30,7 @@ static const char *hdr_version_number;
-
- /* Values take from the supplied config.h. */
- static int have_stdint_h;
-+static int have_sys_types_h;
- static int have_w32_system;
- static int have_w64_system;
- static char *replacement_for_off_type;
-@@ -37,6 +38,7 @@ static int use_posix_threads;
-
- /* Various state flags. */
- static int stdint_h_included;
-+static int sys_types_h_included;
-
-
- /* The usual free wrapper. */
-@@ -151,6 +153,8 @@ parse_config_h (const char *fname)
- continue; /* oops */
- if (!strcmp (p1, "HAVE_STDINT_H"))
- have_stdint_h = 1;
-+ else if (!strcmp (p1, "HAVE_SYS_TYPES_H"))
-+ have_sys_types_h = 1;
- else if (!strcmp (p1, "HAVE_W32_SYSTEM"))
- have_w32_system = 1;
- else if (!strcmp (p1, "HAVE_W64_SYSTEM"))
-@@ -474,8 +478,12 @@ write_special (const char *fname, int lnr, const char *tag)
- }
- else
- {
-- fputs ("#include <sys/types.h>\n"
-- "typedef ssize_t gpgrt_ssize_t;\n", stdout);
-+ if (!sys_types_h_included)
-+ {
-+ fputs ("#include <sys/types.h>\n", stdout);
-+ sys_types_h_included = 1;
-+ }
-+ fputs ("typedef ssize_t gpgrt_ssize_t;\n", stdout);
- }
- }
- else if (!strcmp (tag, "api_ssize_t"))
-@@ -485,6 +493,30 @@ write_special (const char *fname, int lnr, const char *tag)
- else
- fputs ("ssize_t", stdout);
- }
-+ else if (!strcmp (tag, "define:pid_t"))
-+ {
-+ if (have_sys_types_h)
-+ {
-+ if (!sys_types_h_included)
-+ {
-+ fputs ("#include <sys/types.h>\n", stdout);
-+ sys_types_h_included = 1;
-+ }
-+ }
-+ else if (have_w64_system)
-+ {
-+ if (!stdint_h_included && have_stdint_h)
-+ {
-+ fputs ("#include <stdint.h>\n", stdout);
-+ stdint_h_included = 1;
-+ }
-+ fputs ("typedef int64_t pid_t\n", stdout);
-+ }
-+ else
-+ {
-+ fputs ("typedef int pid_t\n", stdout);
-+ }
-+ }
- else if (!strcmp (tag, "include:err-sources"))
- {
- write_sources_or_codes (NULL);
-diff --git a/src/w32-add.h b/src/w32-add.h
-index 6f9f12a..07e3c7d 100644
---- a/src/w32-add.h
-+++ b/src/w32-add.h
-@@ -3,10 +3,6 @@
- ## peculiarity of the script the first used line must not
- ## start with a hash mark.
-
--/* Fixme: This is a quick hack. We need to check whether the compiler
-- * actually in use already knows that type. */
--typedef int pid_t;
--
- /* Decide whether to use the format_arg attribute. */
- #if _GPG_ERR_GCC_VERSION > 20800
- # define _GPG_ERR_ATTR_FORMAT_ARG(a) __attribute__ ((__format_arg__ (a)))
---
-2.11.0
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 -
NEWS | 44 +++++--
README | 4 +-
configure.ac | 1 +
doc/README.de.txt | 18 ++-
doc/README.en.txt | 18 ++-
packages/gen-frameworks.sh | 3 +-
packages/packages.current | 62 +++++-----
...01-Prefer-kleowrapped-gpgwrapped-binaries.patch | 43 -------
...-logic-error-in-new-server-name-detection.patch | 50 --------
.../0001-core-Fix-building-on-W64.patch | 129 ---------------------
src/Makefile.am | 3 +-
src/config.nsi.in | 4 +
src/{inst-ki18n.nsi => inst-kcrash.nsi} | 12 +-
src/inst-sections.nsi | 10 ++
src/{uninst-boost.nsi => uninst-kcrash.nsi} | 10 +-
16 files changed, 132 insertions(+), 282 deletions(-)
delete mode 100755 patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
delete mode 100755 patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
delete mode 100755 patches/libgpg-error-1.28/0001-core-Fix-building-on-W64.patch
copy src/{inst-ki18n.nsi => inst-kcrash.nsi} (79%)
copy src/{uninst-boost.nsi => uninst-kcrash.nsi} (82%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list