No OneTemporary
Actions

Size

28 KB

Subscribers

None

View Options

	diff --git a/Makefile.am b/Makefile.am
	index e4869f6d..7873d4dc 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,98 +1,95 @@
	# Makefile.am - Installer for GnuPG 4 Windows Makefile.
	# Copyright (C) 2005, 2008, 2012 g10 Code 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, see <http://www.gnu.org/licenses/>.

	ACLOCAL_AMFLAGS = -I m4
	AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
	DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32

	SUBDIRS = po packages doc src

	# find patches -type f \| sort \| sed 's/$/ \\/' \| sed 's/^/ /'

	EXTRA_DIST = autogen.sh README.GIT ONEWS \
	doc/license-page doc/GPLv3 \
	build-aux/git-log-footer build-aux/git-log-fix \
	patches/glib-2.41.5/01-socket.patch \
	patches/qtbase/fix-freetype-link.patch \
	patches/qtbase/fix-oci-detect.patch \
	patches/qtbase/fix-syssemaphore.patch \
	patches/qtbase/fix-zlib-link.patch \
	patches/qtbase/relative-paths.patch \
	patches/qtbase/fix-fontconfig.patch \
	patches/qtbase/config-standardpaths.patch \
	patches/w32pth-2.0.5/workaround-broken-libtool.patch \
	patches/qttools/disable-most-tools.patch \
	patches/ki18n/no-tests.patch \
	patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
	patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
	patches/gpgmepp/0002-disable-variants.patch \
	patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
	patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
	patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
	patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
	patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
	patches/kiconthemes/0001-Make-DBus-optional.patch \
	patches/qtsvg/qtsvg-link-zlib.patch \
	patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
	patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
	patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.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/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch \
	- patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch \
	- patches/gpgol-1.4.0/0003-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

	copy-news:
	cp NEWS doc/website/NEWS.last


	copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
	installers/gpg4win-light-$(VERSION).exe \
	installers/gpg4win-vanilla-$(VERSION).exe
	@echo Copying $(VERSION) to $(RELEASEHOST) >&2
	@set -e;\
	if ssh "$$(echo $(RELEASEHOST)\|cut -d: -f -1)" \
	test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe\|cut -d: -f2-)";\
	then echo "This release has already been copied to the server" >&2 ;\
	else scp gpg4win-$(VERSION).tar.bz2 \
	installers/gpg4win-$(VERSION).exe \
	installers/gpg4win-light-$(VERSION).exe \
	installers/gpg4win-vanilla-$(VERSION).exe \
	installers/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
	for f in en de ; do \
	scp src/README.$$f.txt \
	$(RELEASEHOST)/README-$(VERSION).$$f.txt; \
	done;\
	fi

	dist-hook: gen-ChangeLog

	gen_start_date = 2012-03-26T00:00:00
	.PHONY: gen-ChangeLog
	gen-ChangeLog:
	set -e; \
	if test -d $(top_srcdir)/.git; then \
	(cd $(top_srcdir) && \
	$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
	--amend=build-aux/git-log-fix \
	--since=$(gen_start_date) ) > $(distdir)/cl-t; \
	cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
	rm -f $(distdir)/ChangeLog; \
	mv $(distdir)/cl-t $(distdir)/ChangeLog; \
	fi
	diff --git a/packages/packages.current b/packages/packages.current
	index 5c4757bb..3cf9c1de 100644
	--- a/packages/packages.current
	+++ b/packages/packages.current
	@@ -1,562 +1,570 @@
	# packages.current - list of current packages for use with gpg4win -- sh --
	#
	# The download script processes the statements here to
	# actually download the packages. The syntax is trivial:
	#
	# If the first non whitespace character of a line is #, the line is
	# considered a comment. If the first word of a line is "server", the
	# rest of the line will be taken as the base URL for following file
	# commands. If the first word of a line is "file" the rest of the
	# line will be appended to the current base URL (with a / as
	# delimiter). The statement "chk" is followed by the SHA1 checksum of
	# the last file.


	#
	# zlib
	#
	server http://zlib.net

	# checked: 2014-06-20 ah
	file zlib-1.2.8.tar.gz
	chk 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d


	#
	# GNU
	#

	server ftp://ftp.gnu.org/pub/gnu

	#checked: 2016-04-05 jochen
	file libiconv/libiconv-1.14.tar.gz
	chk 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613

	#checked: 2016-04-05 jochen
	file gettext/gettext-0.19.5.tar.xz
	chk 3410a61c5c05d0392533c92133e135de828973fee27477a6d6dd3d3e36f2a2dd

	#
	# GLIB
	#
	# The GTK boyz seem to think that sha256sum files on the server
	# magically get them a lot of additional security karma.
	#
	# And it's plain to see
	# You were meant for me
	# Yeah I'm your .sig
	# Your 21th Century sig
	# 21th Century sig, I wanna be your file
	#
	server http://ftp.gnome.org/pub/gnome/sources/glib/2.41

	# last-changed: 2015-06-05
	# Latest minor release is 2.45 but 2.41 works for us.
	# by: ah
	# compared checksum with debian experimental version.
	# https://lists.debian.org/debian-experimental-changes/2014/09/msg00182.html
	# verified: Sig 3D0E FB95 E7B5 237F 16E8 2258 E352 D5C5 1C50 41D4
	file glib-2.41.5.tar.xz
	chk e76a6bd1456749bdd05db19a8f0f174e787e612ed443d30cc9cf02237dd58e16

	#
	# GDK-PIXBUF
	#
	server http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/

	# checked: 2015-06-05
	# by: ah
	# There is a 2.31 series but afaik no security problems with 2.30
	# verified: with linuxfromscratch and frugalware checksums
	file gdk-pixbuf-2.30.8.tar.xz
	chk 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be


	#
	# ATK
	#
	server http://ftp.gnome.org/pub/gnome/sources/atk/1.32

	# checked: 2013-04-29 wk (1.32.0 still the latest in 1.32)
	file atk-1.32.0.tar.bz2
	chk e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e

	server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32

	# checked: 2013-04-29 wk
	name atk-1.32.0.zip
	file atk_1.32.0-2_win32.zip
	chk cadc6d52f2af21996a6dcba7b1fac27ce66721e14d1c4ab21fde7bc9965f5037

	# checked: 2013-04-29 wk
	name atk-dev-1.32.0.zip
	file atk-dev_1.32.0-2_win32.zip
	chk 5021d64043d270350d6a8d50b91db691a7421a68ca0bfa4eeb0c8804a176ac44

	#
	# PANGO
	#
	server http://ftp.gnome.org/pub/gnome/sources/pango/1.29

	# fixme: 2013-04-29 wk - There is a 1.29.5 but no 1.29.5 binaries
	# What shall we do: Update to 1.32? There are no
	# 1.32 binaries either.
	file pango-1.29.4.tar.bz2
	chk f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b

	server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29

	name pango-1.29.4.zip
	file pango_1.29.4-1_win32.zip
	chk e1b865ae2e4054388c598f92b34593b3d24d7fd15e6308c8926ee634717c21ce

	name pango-dev-1.29.4.zip
	file pango-dev_1.29.4-1_win32.zip
	chk 0d7fb255e65ed4bd43acedab4405986e4877b87ba8227d5fa22b38330485e3cb

	#
	# CAIRO
	#
	server http://cairographics.org/releases

	# checked: 2013-04-29 wk - 1.10.2 is the latest in the 1.10 series.
	file cairo-1.10.2.tar.gz
	chk 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
	# checked: 2013-07-16 ah most recent package on that server is from
	# 2012-09-27 TODO -> Move to another source / source build of those
	# dependencies

	# checked: 2013-04-29 wk
	name cairo-1.10.2.zip
	file cairo_1.10.2-2_win32.zip
	chk e6c361ec1df4ccb23edbe5b68db16329d563a19eeee7fa70d583dda3d2358f4e
	name cairo-dev-1.10.2.zip
	file cairo-dev_1.10.2-2_win32.zip
	chk b86f875bf776bbf578e3fa8c46866b84c93200b962b30d03cf795f82157e3167

	# checked: 2013-04-29 wk
	file freetype-2.4.2.tar.bz2
	chk 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
	name freetype-2.4.2.zip
	file freetype_2.4.2-1_win32.zip
	chk bdf67e6573363fd2256a58295931cc1186382fd0ad1fe420059d6ffdb5fba7c0
	name freetype-dev-2.4.2.zip
	file freetype-dev_2.4.2-1_win32.zip
	chk eed58c2807b65d5e0ec78031e89f1628577ad76bf47f02eaecde432c0b99eae9

	server http://www.fontconfig.org/release

	# checked: 2013-04-29 wk - 2.8.0 still the latest in 2.8
	file fontconfig-2.8.0.tar.gz
	chk fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2013-04-29 wk
	name fontconfig-2.8.0.zip
	file fontconfig_2.8.0-2_win32.zip
	chk 9d6bcaeed0eced43a649953132d9f2b3e15b98c7bb9e4a207872dfeade818204
	name fontconfig-dev-2.8.0.zip
	file fontconfig-dev_2.8.0-2_win32.zip
	chk 2f15af3d27ca507dad2a208e58409f484aa7e7c7eac10b49edca079b31ae7073

	server ftp://ftp.g10code.com/g10code/misc

	# checked: 2013-04-29 wk - 2.0.1 still the latest in 2.0
	file expat-2.0.1.tar.gz
	chk 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2013-04-29 wk
	name expat-2.0.1.zip
	file expat_2.0.1-1_win32.zip
	chk 77b88ab780e698d6590426b26a877878584b9f8b6357909699674fb5045737bd
	name expat-dev-2.0.1.zip
	file expat-dev_2.0.1-1_win32.zip
	chk 67b92b7f3441fee077bdc0094bf4dd673870acdf51899e32e199246801538162


	#
	# GTK+
	#
	server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24

	# last-changed: 2015-06-05
	# by: ah
	# verified: chk from https://download.gnome.org/core/3.17/3.17.2/sources/SHA256SUMS-for-xz
	file gtk+-2.24.28.tar.xz
	chk b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656

	#
	# GIMP stuff for W32
	#
	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2012-03-28 wk - Not updated - not a security problem
	name pkgconfig-0.23.tar.gz
	file pkg-config-0.23.tar.gz
	chk 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53

	name pkgconfig-0.23.zip
	file pkg-config_0.23-3_win32.zip
	chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278


	# PNG

	# last changed: 2015-11-13
	# by: ah
	# verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F
	server ftp://ftp.simplesystems.org/pub/png/src/
	file libpng14/libpng-1.4.19.tar.xz
	chk 52b830ea8900fad3ed46fc91021355211f418c8a41c39699600dbf1db2bbf7ff

	#
	# LibFFI
	#
	server ftp://sourceware.org/pub/libffi

	# checked: 2013-04-29 wk - updated from 3.0.10.
	# checked: 2014-07-16 ah - only rc availble from 3.0.14
	file libffi-3.0.13.tar.gz
	chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c


	#
	# GpgOL
	#
	server ftp://ftp.g10code.com/g10code/gpgol

	# last-changed: 2016-03-30
	# by: ah
	# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
	-file gpgol-1.4.0.tar.bz2
	-chk abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f
	+#
	+# TODO switch back to released version
	+#file gpgol-1.4.0.tar.bz2
	+#chk abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f

	#
	# GpgEX
	#
	server ftp://ftp.g10code.com/g10code/gpgex

	# last-changed: 2016-03-30
	# by: ah
	# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
	file gpgex-1.0.4.tar.bz2
	chk aea2232d026219072491f1bf5b2f189a15552f66377ff4dd3b11c0f069379206

	#
	# Pth emulation
	#

	server ftp://ftp.g10code.com/g10code/w32pth

	# checked: 2014-07-16 ah
	file w32pth-2.0.5.tar.bz2
	chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06

	#
	# Stripped down version of BZIP2
	# (full source at http://bzip.org)
	#
	server ftp://ftp.g10code.com/g10code/bzip2

	# checked: 2014-07-16 ah
	file bzip2-1.0.6-g10.tar.gz
	chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07

	#
	# GnuPG et al.
	#
	# All tarballs from this server are verified with an openpgp
	# signature made by "Werner Koch (dist sig)".
	# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
	server ftp://ftp.gnupg.org/gcrypt

	# last-changed: 2016-07-22
	# by: ah
	file libgpg-error/libgpg-error-1.24.tar.bz2
	chk 9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540

	# last-changed: 2016-07-22
	# by: ah
	file libassuan/libassuan-2.4.3.tar.bz2
	chk 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71

	# last changed: 2016-08-26
	# by: ah
	name gnupg-w32-2.1.15-20160818-bin.exe
	file binary/gnupg-w32-2.1.15_20160818.exe
	chk 4802c8c08fc67964235eddacfd45553363bac0a081e1f38a76008e2bad9617a2

	name gnupg-w32-2.1.15-20160818-src.tar.xz
	file binary/gnupg-w32-2.1.15_20160818.tar.xz
	chk 0f6f07ea28023bbef458c9dd2b04c20260d6c59a5319d0bdab750d933ef18999

	# TODO: Switch back to released version
	# last changed: 2015-12-11
	# by: ah
	#file pinentry/pinentry-0.9.7.tar.bz2
	#chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2

	# TODO: Switch back to released version
	# last changed: 2015-08-26
	# by: ah
	# file gpgme/gpgme-1.6.0.tar.bz2
	# chk b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d

	# last changed: 2015-09-09
	# by: ah
	file gpa/gpa-0.9.9.tar.bz2
	chk 6828d738b9e1d3cce96d2ec9831c09873c4cb2c87ba67a161ef54485192c4334

	# (Snapshots)
	# server ftp://ftp.g10code.com/g10code/scratch


	#
	# GnuPG utilities
	#
	server http://www.jabberwocky.com/software/paperkey

	# checked: 2014-07-16 ah
	file paperkey-1.3.tar.gz
	chk 5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb

	#
	# Kleopatra and dependencies
	#

	# Boost
	# last changes: 2016-01-21
	# by: ah
	# verified: Second source https://github.com/mxe/mxe/commit/fdd5b9f7aa8bf0e40c1f1f8119701af96e51457e

	server http://downloads.sourceforge.net/project/boost/boost/

	name boost-1.60.0.tar.bz2
	file 1.60.0/boost_1_60_0.tar.bz2
	chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b

	# Qt base
	# last changed: 2016-07-22
	# by: ah
	# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz.sha256

	server http://download.qt.io/official_releases/qt/

	name qtbase-5.6.1.tar.xz
	file 5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz
	chk d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264

	# Qt Tools
	# last changed: 2016-07-22
	# by: ah
	# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz.sha256
	name qttools-5.6.1.tar.xz
	file 5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz
	chk 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71

	# Qt Winextras
	# last changed: 2016-07-22
	# by: ah
	# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz.sha256
	name qtwinextras-5.6.1.tar.xz
	file 5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz
	chk a86a3d7131ce3534689af9889c0f8d09b3f0f97234256829fac0292433a363b5

	# Qt svg
	# last changed: 2016-07-22
	# by: ah
	# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz.sha256
	name qtsvg-5.6.1.tar.xz
	file 5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz
	chk f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21


	# KDE Frameworks generated by gen-frameworks.sh

	server http://download.kde.org/stable/frameworks/

	##### Paste Here #####
	# extra-cmake-modules
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/extra-cmake-modules-5.25.0.tar.xz
	chk 73c90e67c328076c2bee35884836087e7e9f753e48fc0063c8348b6f66b0345f

	# kconfig
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kconfig-5.25.0.tar.xz
	chk 498332f1c3fbb5e0d681cf6807502c1fe0aef74e79b29cd1e60e4096924949c2

	# ki18n
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/ki18n-5.25.0.tar.xz
	chk 5d9ae669b2c6a7637489ffb04d603762512fe8c78501ea5318acc387741e7167

	# kwidgetsaddons
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kwidgetsaddons-5.25.0.tar.xz
	chk 1e099d9e021dc44fdee54220b30d3f48a72900fa88e8273ee7fea2895946a8bd

	# kcompletion
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kcompletion-5.25.0.tar.xz
	chk 6a8af0a084ce697f57382f16157b0c21e4287c809819611fb7e6171e7e149d4a

	# kwindowsystem
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kwindowsystem-5.25.0.tar.xz
	chk b8228dddcc6487e234f81239bea7ca7ae261af8fef7b9e5d7a8b49aa3ac5d0dd

	# kcoreaddons
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kcoreaddons-5.25.0.tar.xz
	chk 5479180bcb6034cfcfbe779d88d91e11233f2120ba6314d180a1f87ad3f02c09

	# kcodecs
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kcodecs-5.25.0.tar.xz
	chk d5bef19f3575784e93b55db76bbaea7f8dba2bed4ffd9b9fbbb52db6d85f4ea5

	# kconfigwidgets
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kconfigwidgets-5.25.0.tar.xz
	chk f394366fb3d3e65b2c4ea49428113c5081f8a05d2e6cc945cb2b910b55d691fe

	# kxmlgui
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kxmlgui-5.25.0.tar.xz
	chk 1ff1f07fc1bede0cb0b498de2d2b0db088639b91d0f7c39a90abfc032dbb44b2

	# kguiaddons
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kguiaddons-5.25.0.tar.xz
	chk 136cb22285eeb7e15a02cdcc8e8bc65edc777dd923125bd64695eb10c9ff5d9f

	# kitemviews
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kitemviews-5.25.0.tar.xz
	chk 98078899862514cc16ceff0275fe5eab43bc14e8f361af11a8e3c45a2fc5a284

	# kitemmodels
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kitemmodels-5.25.0.tar.xz
	chk e44a5c4ba997993057e8ebda6df400c3f1b97bf81d11bb02af27950ff1cd749d

	# kiconthemes
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/kiconthemes-5.25.0.tar.xz
	chk dfea9b4da835c028b62faec6550d279a3a75874ff88d996d2b603be4f9b228b5

	# breeze-icons
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/breeze-icons-5.25.0.tar.xz
	chk e274c7f5c71c177e2e9d8ced9c49cd052ec2f726cb693c7df73e96af12277e8f

	# karchive
	# last changed: 2016-08-26
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
	file 5.25/karchive-5.25.0.tar.xz
	chk 0c338f1e1adc5522de6555fa3fa8c6ebcde29ce48e1f5959beca12d46aea88d8
	##### End Paste #####

	# KDE Applications

	server http://download.kde.org/stable/applications/
	# kmime
	# last changed: 2016-07-22
	# by: ah
	# verified: https://www.kde.org/info/applications-16.04.3.php
	file 16.04.3/src/kmime-16.04.3.tar.xz
	chk 161c4b963f57bc52894fb63a5288e20e92651313136066698c02ead4a6d194b3


	# Devel versions are needed until Kleopatra can be based on
	# a stable branch.
	server http://files.intevation.de/projects/gpg4all

	# Pinentry master to show new pinentry features under devel.
	# by: ah
	# verified: tarball created by ah
	file pinentry/pinentry-0.9.8-beta26.tar.bz2
	chk b85a1aa93375758e3a3c3b0f5938799fd6310a882cb1d6d027462dc2c9297a97

	# ditto for gpgme.
	# by: ah
	# verified: tarball created by ah
	-file gpgme/gpgme-1.7.0-beta319.tar.bz2
	-chk 39e6d9c3d479a73b62a7310b295cd3a6b5bac03bac82396645b43fa12329f74a
	+file gpgme/gpgme-1.7.2-beta36.tar.bz2
	+chk 751816fe804ded00e3992bd8b5d8f7000f26a748c76dfb2f2099cf1206444e11
	+
	+# ditto for gpgol.
	+# by: ah
	+# verified: tarball created by ah
	+file gpgol/gpgol-2.0.0-beta160.tar.bz2
	+chk 3fc9a322efbba8543ffbafac797741b2091109c26024605a71ac6447d2ea1273

	# Gpgmepp
	# last changed: 2016-01-21
	# by: ah
	# verified: https://www.kde.org/info/applications-15.12.1.php
	# file 15.12.1/src/gpgmepp-15.12.1.tar.xz
	# chk 56d5f05bd513efc6caf770e43b6109e42842198f
	#
	# Gpgmepp-devel
	# last changed: see package date
	# by: ah
	# verified: Tarball created by ah.

	file gpgmepp/gpgmepp-201608261655.tar.xz
	chk 0cbe8d70f043f5afbc75461a04b7b3ac839a2ae54e131e06b0837ee64c04ca06


	# Libkleo
	# last changed: see package date.
	# by: ah
	# verified: Tarball created by ah.
	file libkleo/libkleo-201608261656.tar.xz
	chk 40e982aa06fddfea50c3794b2fcb73232458cbb5111d5201a59d94a1bfe2ece2

	# KDE-L10n
	# last changed: 2016-02-19
	# by: ah
	# verified: Tarball created by ah with script kde-l10n.sh
	file kde-l10n/kde-l10n-201602191116-bin.tar.xz
	chk 3e73412a8444cd22262a5ebbe0a6f546cc68b24fa66bd5c6705df54f45a4d68b

	file kde-l10n/kde-l10n-201602191116-src.tar.xz
	chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592

	# Kleopatra
	# last changed: see package date.
	# by: ah
	# verified: Tarball created by ah.
	file kleopatra/kleopatra-201609051810.tar.gz
	chk 73498bcbc40ffb3e3a4f0998a178c94480e4de78380b0992e3811aa335e4067f
	diff --git a/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch b/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
	deleted file mode 100755
	index 20f91d8e..00000000
	--- a/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
	+++ /dev/null
	@@ -1,71 +0,0 @@
	-#! /bin/sh
	-patch -p1 -l -f $* < $0
	-exit $?
	-
	-From a10532b6cf3527391bdb14470fbebf0205b9253a Mon Sep 17 00:00:00 2001
	-From: Andre Heinecke <aheinecke@intevation.de>
	-Date: Tue, 28 Jun 2016 10:47:38 +0200
	-Subject: [PATCH 1/2] Fix UI Server startup
	-
	-* src/common.c (get_gpg4win_dir): Fix stupid logic error in loop.
	-Fix mem leak on error.
	-* src/engine-assuan.c (get_uiserver_name): Prefer 2.3.x names to
	-prefer the kleowrapped / gpgwrapped exectuables.
	-
	---
	-Thanks to rpr who reported this on the gpg4win message board.
	----
	- src/common.c \| 11 ++++++++---
	- src/engine-assuan.c \| 6 +++---
	- 2 files changed, 11 insertions(+), 6 deletions(-)
	-
	-diff --git a/src/common.c b/src/common.c
	-index b7b48b0..9b554b2 100644
	---- a/src/common.c
	-+++ b/src/common.c
	-@@ -1245,10 +1245,10 @@ get_gpg4win_dir()
	- const char *g4win_keys[] = {GPG4WIN_REGKEY_3,
	- GPG4WIN_REGKEY_2,
	- NULL};
	-- const char *key;
	-- for (key = g4win_keys; key; key++)
	-+ const char **key;
	-+ for (key = g4win_keys; *key; key++)
	- {
	-- char *tmp = read_w32_registry_string (NULL, key, "Install Directory");
	-+ char tmp = read_w32_registry_string (NULL, key, "Install Directory");
	- if (!tmp)
	- {
	- continue;
	-@@ -1257,6 +1257,11 @@ get_gpg4win_dir()
	- {
	- return tmp;
	- }
	-+ else
	-+ {
	-+ log_debug ("Failed to access: %s\n", tmp);
	-+ xfree (tmp);
	-+ }
	- }
	- return NULL;
	- }
	-diff --git a/src/engine-assuan.c b/src/engine-assuan.c
	-index f2e0b09..32dbae8 100644
	---- a/src/engine-assuan.c
	-+++ b/src/engine-assuan.c
	-@@ -348,10 +348,10 @@ get_uiserver_name (void)
	- char dir, uiserver, *p;
	- int extra_arglen = 9;
	-
	-- const char * server_names[] = {"bin\\kleopatra.exe",
	-- "kleopatra.exe",
	-- "bin\\gpa.exe",
	-+ const char * server_names[] = {"kleopatra.exe",
	-+ "bin\\kleopatra.exe",
	- "gpa.exe",
	-+ "bin\\gpa.exe",
	- NULL};
	- const char *tmp = NULL;
	-
	---
	-2.1.4
	diff --git a/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch b/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
	deleted file mode 100755
	index 5b65c403..00000000
	--- a/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
	+++ /dev/null
	@@ -1,39 +0,0 @@
	-#! /bin/sh
	-patch -p1 -l -f $* < $0
	-exit $?
	-
	-From 643575f38f545456afc456e1045b914d3d06bbb8 Mon Sep 17 00:00:00 2001
	-From: Andre Heinecke <aheinecke@intevation.de>
	-Date: Wed, 29 Jun 2016 17:17:48 +0200
	-Subject: [PATCH 2/2] Ignore sent S/MIME Mails if S/MIME is disabled
	-
	-* src/mapihelp.cpp (mapi_change_message_class): Add check for
	-S/MIME disabled.
	-
	---
	-Outlook sets sent Mails to IPM.Note.SMIME (without suffix). When
	-S/MIME is disabled we need to ignore these messages. Our own
	-messages that are marked as S/MIME messages on send even if they
	-are PGP Messages have the override message class set so they are not
	-affected by this.
	-
	-GnuPG-Bug-Id: 2319
	----
	- src/mapihelp.cpp \| 2 +-
	- 1 file changed, 1 insertion(+), 1 deletion(-)
	-
	-diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
	-index 7d11364..e916209 100644
	---- a/src/mapihelp.cpp
	-+++ b/src/mapihelp.cpp
	-@@ -1226,7 +1226,7 @@ mapi_change_message_class (LPMESSAGE message, int sync_override)
	- {
	- newvalue = change_message_class_ipm_note (message);
	- }
	-- else if (!strcmp (s, "IPM.Note.SMIME"))
	-+ else if (opt.enable_smime && !strcmp (s, "IPM.Note.SMIME"))
	- {
	- newvalue = change_message_class_ipm_note_smime (message);
	- }
	---
	-2.1.4
	diff --git a/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch b/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
	deleted file mode 100755
	index 46cdb8d9..00000000
	--- a/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
	+++ /dev/null
	@@ -1,47 +0,0 @@
	-#! /bin/sh
	-patch -p1 -l -f $* < $0
	-exit $?
	-
	-From c8cdb4c9a9bb590b8785b483cf71657e20e0b92d Mon Sep 17 00:00:00 2001
	-From: Andre Heinecke <aheinecke@intevation.de>
	-Date: Thu, 11 Aug 2016 15:59:57 +0200
	-Subject: [PATCH] Fix loop logic error in new server name detection
	-
	-* src/engine-assuan.c (get_uiserver_name): Fix name loop.
	----
	- src/engine-assuan.c \| 8 ++++----
	- 1 file changed, 4 insertions(+), 4 deletions(-)
	-
	-diff --git a/src/engine-assuan.c b/src/engine-assuan.c
	-index 32dbae8..c60713b 100644
	---- a/src/engine-assuan.c
	-+++ b/src/engine-assuan.c
	-@@ -353,7 +353,7 @@ get_uiserver_name (void)
	- "gpa.exe",
	- "bin\\gpa.exe",
	- NULL};
	-- const char *tmp = NULL;
	-+ const char **tmp = NULL;
	-
	- dir = get_gpg4win_dir ();
	- if (!dir)
	-@@ -384,14 +384,14 @@ get_uiserver_name (void)
	- return name;
	- }
	- /* Fallbacks */
	-- for (tmp = server_names; tmp; tmp++)
	-+ for (tmp = server_names; *tmp; tmp++)
	- {
	- if (name)
	- {
	- xfree (name);
	- }
	-- name = xmalloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
	-- strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
	-+ name = xmalloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
	-+ strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
	- for (p = name; *p; p++)
	- if (*p == '/')
	- *p = '\\';
	---
	-2.1.4

File Metadata

Mime Type: text/x-diff
Expires: Sun, Dec 28, 10:12 PM (4 h, 25 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 8e/f4/e9f02d15d1f26b86b336ba30be86

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions