[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.2-8-g1c9fd40
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Jan 11 08:08:17 CET 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 1c9fd401222cf5676818bc9bfaa88e85577388a9 (commit)
via 080525b9728cd6402c095512fb45b0b26b651263 (commit)
via a91cd7147ef96f41482b5418752658f1089fd220 (commit)
via 059ed36cde6121a775832cb9c4a2caffd83828bb (commit)
from 7a45576ec9c60ce3884caf6ffcf9825ebfddc328 (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 1c9fd401222cf5676818bc9bfaa88e85577388a9
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 11 08:07:42 2018 +0100
Update gpgol to latest beta
--
For RC testing we use the beta and release GpgOL 2.0.6 if
everything is fine.
diff --git a/packages/packages.current b/packages/packages.current
index 1ce3307..62644de 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -238,9 +238,13 @@ server http://files.gpg4win.org/src
# last-changed: 2017-12-08
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
-file gpgol/gpgol-2.0.5.tar.bz2
-chk 8fa5d4d13edfb344ec75a0e9dce3e633e6ce81e92cd388b73e2d34a14c78d46e
+#file gpgol/gpgol-2.0.5.tar.bz2
+#chk 8fa5d4d13edfb344ec75a0e9dce3e633e6ce81e92cd388b73e2d34a14c78d46e
+# for beta
+server http://files.gpg4win.org/Beta/gpgol
+file 2.0.6-beta9/gpgol-2.0.6-beta9.tar.bz2
+chk 1e956632633a708da46bdd932d34f76350c001d3b857efd75ccc55a0b7a28fb7
#
# GpgEX
#
commit 080525b9728cd6402c095512fb45b0b26b651263
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 11 07:34:34 2018 +0100
Update GnuPG to 2.2.4
--
diff --git a/NEWS b/NEWS
index 73c2d23..901e73e 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Noteworthy changes in Version 3.0.3 (unreleased)
------------------------------------------------
~~~~~~~~~~~~~~~
-GnuPG: 2.2.3
+GnuPG: 2.2.4
Kleopatra: 3.0.2
GPA: 0.9.9
GpgOL: 2.0.5
diff --git a/packages/packages.current b/packages/packages.current
index 7402a89..1ce3307 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -289,15 +289,15 @@ chk 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
file libassuan/libassuan-2.5.1.tar.bz2
chk 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
-# last changed: 2017-12-05
+# last changed: 2018-01-11
# by: ah
-name gnupg-w32-2.2.3-20171207-bin.exe
-file binary/gnupg-w32-2.2.3_20171207.exe
-chk a282a175501fc5b06f70e249fe503250293d8cb2a14e28a4a8ea476ede8ea9fa
+name gnupg-w32-2.2.4-20171220-bin.exe
+file binary/gnupg-w32-2.2.4_20171220.exe
+chk 2030f00548ec175cac4996a8128ed71393c156429d95f3e6c2f53194b2f4d885
-name gnupg-w32-2.2.3-20171207-src.tar.xz
-file binary/gnupg-w32-2.2.3_20171207.tar.xz
-chk aa99e2cc3c018a4b95d79a279b041273df560f03dd46413ad3567659d438f0e3
+name gnupg-w32-2.2.4-20171220-src.tar.xz
+file binary/gnupg-w32-2.2.4_20171220.tar.xz
+chk b9707e1c761b6bfef9d9062f188e0c9fc41c1f98da67c71cb75984d46d019d72
# last changed: 2017-12-05
commit a91cd7147ef96f41482b5418752658f1089fd220
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 11 07:26:03 2018 +0100
Update libkleo and kleopatra
--
diff --git a/NEWS b/NEWS
index a77431d..73c2d23 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ Noteworthy changes in Version 3.0.3 (unreleased)
~~~~~~~~~~~~~~~
GnuPG: 2.2.3
-Kleopatra: 3.0.1
+Kleopatra: 3.0.2
GPA: 0.9.9
GpgOL: 2.0.5
GpgEX: 1.0.5
diff --git a/packages/packages.current b/packages/packages.current
index 6439979..7402a89 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -524,8 +524,8 @@ server http://files.intevation.de/projects/gpg4all
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file libkleo/libkleo-201712081028.tar.gz
-chk 6102a00943999e6f4a71515587d83b3b4ac448a7c81ef1fcc3b8894888f87147
+file libkleo/libkleo-201801110724.tar.gz
+chk 4bbe4c687876bf48ad041fc5d2f6d08595c5058e8ecbb08934564442f55700f1
# KDE-L10n
# last changed: see package date.
@@ -543,5 +543,5 @@ chk 4e6993d5a28de4f4338d96de0edb5d7cb9243976d647162d0539b021a853bafb
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201712081026.tar.gz
-chk 389f5f58c2ca9207331f701679dce475f2c7cfd5c43cfb3212b6df81314d4704
+file kleopatra/kleopatra-201801110728.tar.gz
+chk b0ce499479d058fe92d497d33e9908c55fe3721797e5218caacdfddd42a146b4
diff --git a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
index 533d4ef..88df47e 100755
--- a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
+++ b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
@@ -227,9 +227,9 @@ index 0000000..58881f8
diff --git a/src/fileoperationspreferences.cpp b/src/fileoperationspreferences.cpp
new file mode 100644
index 0000000..d2d20fc
---- /dev/null
-+++ b/src/fileoperationspreferences.cpp
-@@ -0,0 +1,30 @@
+--- /dev/null 2018-01-08 07:35:44.039369717 +0100
++++ src/fileoperationspreferences.cpp 2018-01-09 15:42:01.999936689 +0100
+@@ -0,0 +1,33 @@
+// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
+// All changes you do to this file will be lost.
+
@@ -254,6 +254,9 @@ index 0000000..d2d20fc
+ KConfigSkeleton::ItemBool *itemAddASCIIArmor;
+ itemAddASCIIArmor = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "ascii-armor" ), mAddASCIIArmor, false );
+ addItem( itemAddASCIIArmor, QStringLiteral( "AddASCIIArmor" ) );
++ KConfigSkeleton::ItemBool *itemDontUseTmpDir;
++ itemDontUseTmpDir = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "dont-use-tmp-dir" ), mDontUseTmpDir, false );
++ addItem( itemDontUseTmpDir, QStringLiteral( "DontUseTmpDir" ) );
+}
+
+FileOperationsPreferences::~FileOperationsPreferences()
@@ -263,9 +266,9 @@ index 0000000..d2d20fc
diff --git a/src/fileoperationspreferences.h b/src/fileoperationspreferences.h
new file mode 100644
index 0000000..9866a70
---- /dev/null
-+++ b/src/fileoperationspreferences.h
-@@ -0,0 +1,102 @@
+--- /dev/null 2018-01-08 07:35:44.039369717 +0100
++++ src/fileoperationspreferences.h 2018-01-09 15:42:01.995936609 +0100
+@@ -0,0 +1,120 @@
+// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
+// All changes you do to this file will be lost.
+#ifndef KLEO_FILEOPERATIONSPREFERENCES_H
@@ -337,7 +340,7 @@ index 0000000..9866a70
+ }
+
+ /**
-+ Set Create signed and or encrypted files as text files.
++ Set Create signed or encrypted files as text files.
+ */
+ void setAddASCIIArmor( bool v )
+ {
@@ -346,13 +349,30 @@ index 0000000..9866a70
+ }
+
+ /**
-+ Get Create signed and or encrypted files as text files.
++ Get Create signed or encrypted files as text files.
+ */
+ bool addASCIIArmor() const
+ {
+ return mAddASCIIArmor;
+ }
+
++ /**
++ Set Create temporary decrypted files in the folder of the encrypted file.
++ */
++ void setDontUseTmpDir( bool v )
++ {
++ if (!isImmutable( QStringLiteral( "DontUseTmpDir" ) ))
++ mDontUseTmpDir = v;
++ }
++
++ /**
++ Get Create temporary decrypted files in the folder of the encrypted file.
++ */
++ bool dontUseTmpDir() const
++ {
++ return mDontUseTmpDir;
++ }
++
+ protected:
+
+ // FileOperations
@@ -360,6 +380,7 @@ index 0000000..9866a70
+ bool mAutoDecryptVerify;
+ QString mArchiveCommand;
+ bool mAddASCIIArmor;
++ bool mDontUseTmpDir;
+
+ private:
+};
commit 059ed36cde6121a775832cb9c4a2caffd83828bb
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 11 07:24:13 2018 +0100
Switch gpgme to released 1.10 version
--
diff --git a/packages/packages.current b/packages/packages.current
index 8be6ed0..6439979 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -305,10 +305,10 @@ chk aa99e2cc3c018a4b95d79a279b041273df560f03dd46413ad3567659d438f0e3
file pinentry/pinentry-1.1.0.tar.bz2
chk 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
-# TODO switch back to released version
+# last changed: 2018-01-11
# by: ah
-#file gpgme/gpgme-1.9.0.tar.bz2
-#chk 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+file gpgme/gpgme-1.10.0.tar.bz2
+chk 1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693
# last changed: 2017-01-04
# by: ah
@@ -517,8 +517,8 @@ chk 40c874c98c0eb0c76e9a5015aab5d5ed791c1e0bed138f412fb496031e80eb3f
server http://files.intevation.de/projects/gpg4all
# by: ah
-file gpgme/gpgme-1.10.0-beta90.tar.bz2
-chk d7b8f5456192349df14287f5e5222f1e44102b36a7558c98fa09a9251957e808
+#file gpgme/gpgme-1.10.0-beta90.tar.bz2
+#chk d7b8f5456192349df14287f5e5222f1e44102b36a7558c98fa09a9251957e808
# Libkleo
# last changed: see package date.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 +--
packages/packages.current | 40 ++++++++++++----------
...k-generated-conf-files-for-Crosscompiling.patch | 37 +++++++++++++++-----
3 files changed, 53 insertions(+), 28 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list