Page MenuHome GnuPG
Files F34381782

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index 03240c03..31b2c3c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,163 +1,162 @@
# 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-xz no-dist-gzip
DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
if BUILD_GPG4WIN
po = po
else
po =
endif
if BUILD_GPG4WIN
doc = doc
else
doc =
endif
SUBDIRS = ${po} packages ${doc} src
# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
# find -L patches-appimage -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
EXTRA_DIST = build.sh autogen.rc autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 build.sh \
build-aux/git-log-footer build-aux/git-log-fix \
build-aux/gpg-authcode-sign.sh \
docker/appimage/Dockerfile \
docker/appimage/Dockerfile-CentOS7 \
docker/gpg4win-bookworm/Dockerfile \
patches/breeze-icons/0001-Draft-Handle-cross-compiling-for-tools.patch \
patches/breeze-icons/add-the-nose.patch \
patches/breeze/0001-Do-not-alias-QtOpenGL-and-QtNetwork.patch \
patches/extra-cmake-modules/0001-Do-not-abort-without-QML-native.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/jpeg/fix-redefine.patch \
patches/kcalendarcore/0001-Add-option-to-build-without-QML.patch \
patches/kcoreaddons/0001-Fix-MINGW-build.patch \
patches/ki18n/0001-Undef-snprintf-for-windows.patch \
patches/kjobwidgets/0001-Remove-knotification.patch \
patches/knotifications/0001-Fix-build-wihout-QDbus.patch \
patches/ktextaddons/0001-Remove-unused-QDbus-includes.patch \
patches/mimetreeparser/fix-build-error-in-202412051138.patch \
patches/libical/workaround-weird-mingw-10.0.0-issue.patch \
patches/okular/0001-Add-GnuPG-specific-manifest-to-okular.patch \
patches/okular/lower-cmake-requirement.patch \
patches/pcre2/cross-build-cmake.patch \
patches/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \
patches/qtbase/add-kleopatras-mime-types.patch \
patches/qtbase/qt_use_share_instead_of_data.patch \
patches/qtbase/configurable-windowstheme.patch \
patches-appimage/extra-cmake-modules/0001-Do-not-abort-without-QML-native.patch \
patches-appimage/kcrash/0001-DRAFT-Do-not-use-OpenGL-if-it-is-not-available.patch \
- patches-appimage/kio/0001-Remove-kencodingfiledialog-to-avoid-Qt5Compat.patch \
patches-appimage/kjobwidgets/0001-Remove-knotification.patch \
patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch \
patches-appimage/okular/lower-cmake-requirement.patch \
patches-appimage/qtbase/add-kleopatras-mime-types.patch \
patches-appimage/kcalendarcore/0001-Add-option-to-build-without-QML.patch
dist-hook: gen-ChangeLog
if BUILD_W64_COND
w64_extraargs=" --w64"
endif
distcheck-hook:
set -e; ( \
pref="#+macro: gpg4win_" ;\
reldate="$$(date -u +%Y-%m-%d)" ;\
echo "$${pref}ver $(PACKAGE_VERSION)" ;\
echo "$${pref}date $${reldate}" ;\
list='$(DIST_ARCHIVES)'; for i in $$list; do \
case "$$i" in *.tar.bz2) \
echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
esac;\
done ) | tee $(distdir).swdb
# Names of to help the release target.
RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
OUTDIR="$(abs_top_srcdir)/artifacts/$(RELEASE_NAME)-nightly-$(BUILD_DATETIME)"
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
-download: packages/packages.common packages/packages.4 packages/packages.3
+download: packages/packages.common
(cd packages; ./download.sh)
vsd-versions: src/stamps/stamp-versions-all-signed
rebuild:
./build.sh --update-img --inplace $(w64_extraargs)
clean-local:
-rm -rf artifacts
-rm -f $(RELEASE_NAME).tar.xz
distclean-local:
-rm -f $(RELEASE_NAME).swdb
# (cd $(abs_top_srcdir)/packages && ./download.sh -u && \
# ./gen-tarball.sh -f && git commit -a -m "nightly changes: $(BUILD_DATETIME)") || exit 1; \
# $(abs_top_srcdir)/autogen.sh --build-w32
nightly:
echo "/* Running configure */"
$(abs_top_srcdir)/autogen.sh --force
echo "/* Running make distcheck */"
$(MAKE) distcheck TESTFLAGS=--parallel
echo "/* Unpacking release */"
rm -rf $(abs_top_srcdir)/PLAY
$(MKDIR_P) $(abs_top_srcdir)/PLAY
$(MKDIR_P) $(OUTDIR)
(cd $(abs_top_srcdir)/PLAY && $(AMTAR) xJf ../$(RELEASE_NAME).tar.xz)
(cd $(abs_top_srcdir)/PLAY/$(RELEASE_NAME) && \
./build.sh $(W64ARGS) --update-image --clean -o $(abs_top_srcdir)/PLAY/build-w64 && \
./build.sh --appimage --update-image --clean -o $(abs_top_srcdir)/PLAY/build-lin && \
mv artifacts/* $(OUTDIR) && \
mv $(RELEASE_NAME).tar.xz $(OUTDIR) && \
git format-patch HEAD~1) && \
mv 000*nightly*.patch $(OUTDIR)/$(BUILD_DATETIME)-nightly-changes.patch && \
mv $(OUTDIR)/$(BUILD_DATETIME)-nightly-changes.patch $(OUTDIR) && \
git reset HEAD~1 && \
echo "Results can be found under $(OUTDIR)"
msi:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi
msi-signed:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi-signed
msi-upload:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi-upload
diff --git a/packages/Makefile.am b/packages/Makefile.am
index 4f3d92fd..6c3f21cc 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,41 +1,42 @@
# Makefile.am - Installer for GnuPG 4 Windows Makefile.
# Copyright (C) 2005 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-EXTRA_DIST = download.sh packages.common packages.3 packages.4 BUILDTYPE \
- gen-frameworks.sh gen-tarball.sh gen-kde-gears.sh \
- get-gpg-package.sh distsigkey.gpg kde-release-keys.gpg \
- gen-kde-l10n.sh \
- $(wildcard *.tar.gz *.tar.bz2 *.tar.xz *.zip *.exe *.wixlib)
+EXTRA_DIST = \
+ download.sh packages.common BUILDTYPE \
+ gen-frameworks.sh gen-tarball.sh gen-kde-gears.sh gen-gnupg.sh \
+ distsigkey.gpg kde-release-keys.gpg \
+ gen-kde-l10n.sh \
+ $(wildcard *.tar.gz *.tar.bz2 *.tar.xz *.zip *.exe *.wixlib)
packages-clean:
rm -f *.tar.* *.zip *.exe *.wixlib
#upload: packages.current packages.current.sig
# set -e; \
# echo "Uploading package list to www.gpg4win.org ..."; \
# user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
# rsync -v -W packages.current{,.sig} \
# $${user}@wald.intevation.org:/gpg4win/htdocs/
#
#
#packages.current.sig : packages.current
# @echo "packages.current.sig is expected to be a detached signature of packages.current"
# @echo "Use \"gpg -sbu YOUR_KEYID packages.current\" to create it"
# @false
#
diff --git a/packages/distsigkey.gpg b/packages/distsigkey.gpg
index bd661d0b..4c4db51c 100644
Binary files a/packages/distsigkey.gpg and b/packages/distsigkey.gpg differ
diff --git a/packages/get-gpg-package.sh b/packages/get-gpg-package.sh
deleted file mode 100755
index b99216ef..00000000
--- a/packages/get-gpg-package.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# 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
-
-# Check gpg packages against their distsigkey and print out the lines
-# for packages.current
-#
-# TODO: Update packages.current automatically
-set -e
-#set -x
-
-GNUPG="libgpg-error libgcrypt libksba libassuan ntbtls npth pinentry gpgme gnupg"
-GPG4WIN="gpgex gpgol"
-
-WGET=wget
-GPGV=gpgv
-
-srcdir=$(readlink -f `dirname "$0"`)
-distsigkey="$srcdir/distsigkey.gpg"
-
-if [ -z "$1" -o -z "$2" ]; then
- echo "Usage $0 <package> <Version> [user]"
- exit 1
-fi
-
-if [ -z "$3" ]; then
- CHANGER="ah"
-else
- CHANGER="$3"
-fi
-
-if ! $GPGV --version >/dev/null 2>/dev/null ; then
- echo "command \"gpgv\" is not installed" >&2
- exit 1
-fi
-
-function list_include_item {
- local list="$1"
- local item="$2"
- if [[ $list =~ (^|[[:space:]])"$item"($|[[:space:]]) ]] ; then
- # yes, list include item
- result=0
- else
- result=1
- fi
- return $result
-}
-
-if `list_include_item "$GNUPG" "$1"` ; then
- SERVER="https://gnupg.org/ftp/gcrypt"
-elif `list_include_item "$GPG4WIN" "$1"` ; then
- SERVER="http://files.gpg4win.org/src"
-else
- echo "Unknown package $1";
- exit 1;
-fi
-
-FILE="$1-$2.tar.bz2"
-FILEPATH="$1/$FILE"
-MYTMP=$(mktemp -d)
-
-cd $MYTMP
-$WGET $SERVER/$FILEPATH
-$WGET $SERVER/$FILEPATH.sig
-
-if ! $GPGV --keyring "$distsigkey" $FILE.sig $FILE; then
- echo "package is not valid!" >&2
- exit 1
-fi
-
-SHASUM=$(sha256sum $FILE | cut -d " " -f 1)
-DATE=$(date +%Y-%m-%d)
-
-echo "# last changed $DATE"
-echo "# by $CHANGER"
-echo "# verified: distsigkey.gpg"
-echo "server $SERVER"
-echo "file $FILEPATH"
-echo "chk $SHASUM"
-cd -
-rm -r $MYTMP

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jan 3, 11:46 PM (22 h, 31 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
d6/9b/12082e0902f7247418cffa0a83bb

Event Timeline