This is the patch series for the update of gnupg from the legacy 1.4 branch to the LTS 2.2 branch.
Required for build and use are libassuan New requirement for 2.2 branch - change from addon to Core program libksba New requirement for 2.2 branch - new install npth New requirement for 2.2 branch - new install
pinentry not required for build. Is required for some uses of gnupg such as when providing passwords. This does not apply the the IPFire use cases.
Trying to update gpgme with the old 1.4 branch gnupg resulted in various fails. Was looking for files that were not present. Updating gpgme with 2.2 branch of gnupg was successful.
The iso created from the build of all the changes from this patch series was installed in my vm testbed. Keys successfully imported. Package lists successfully read and put into pakfire wui page. Several addons installed successfully. Packages had signatures successfully verified. My testing indicates that gnupg 2.2 branch is successfully working in IPFire in place of the 1.4 branch
Adolf Belka (5): gnupg: Update to 2.2.27 libassuan: Convert from addon to core program libksba: required for gnupg 2.2 series npth: required for gnupg 2.2 series gpgme: Update to 1.15.1
config/rootfiles/common/gnupg | 107 ++++++++++-- .../rootfiles/{packages => common}/libassuan | 0 config/rootfiles/common/libksba | 9 + config/rootfiles/common/npth | 7 + config/rootfiles/packages/gpgme | 162 +++++++++++++++++- lfs/gnupg | 4 +- lfs/gpgme | 6 +- lfs/libassuan | 6 - lfs/libksba | 79 +++++++++ lfs/npth | 79 +++++++++ make.sh | 2 + 11 files changed, 434 insertions(+), 27 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%) create mode 100644 config/rootfiles/common/libksba create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/libksba create mode 100644 lfs/npth
- Update from 1.4.23 (Legacy branch) to 2.2.27 (LTS branch) - Update of rootfile - gnupg 2.2 requires libassuan, libksba and npth for the build and use. pinentry is not required for the build and is not needed for the gpg uses in IPFire - gpg --import in src/initscripts/system/pakfire - gpg --verify --status-fd 1 in src/pakfire/lib/functions.pl - gpg -d --batch --quiet --no-verbose --status-fd 2 --output in src/pakfire/lib/functions.pl Tested by installing the iso created by build of this patch series Keys successfully imported. Installation of addons successfully carried out with signatures being checked and verified. - libassuan had to be changed from an addon to a core program - make.sh updated to include libksba and npth which are provided as separate patches in this series
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/gnupg | 107 ++++++++++++++++++++++++++++++---- lfs/gnupg | 4 +- make.sh | 2 + 3 files changed, 101 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg index edd2beccb..8bcad92da 100644 --- a/config/rootfiles/common/gnupg +++ b/config/rootfiles/common/gnupg @@ -1,16 +1,103 @@ +#usr/bin/dirmngr +#usr/bin/dirmngr-client usr/bin/gpg -#usr/bin/gpg-zip +#usr/bin/gpg-agent +#usr/bin/gpg-connect-agent +#usr/bin/gpg-wks-server +#usr/bin/gpgconf +#usr/bin/gpgparsemail +#usr/bin/gpgscm +#usr/bin/gpgsm #usr/bin/gpgsplit +#usr/bin/gpgtar #usr/bin/gpgv -#usr/lib/gnupg -usr/lib/gnupg/gpgkeys_curl -usr/lib/gnupg/gpgkeys_finger -usr/lib/gnupg/gpgkeys_hkp -usr/lib/gnupg/gpgkeys_ldap +#usr/bin/kbxutil +#usr/bin/watchgnupg +usr/lib/dirmngr_ldap +usr/lib/gpg-check-pattern +usr/lib/gpg-preset-passphrase +usr/lib/gpg-protect-tool +usr/lib/gpg-wks-client +usr/lib/scdaemon +#usr/sbin/addgnupghome +#usr/sbin/applygnupgdefaults +#usr/share/doc/gnupg +#usr/share/doc/gnupg/DCO +#usr/share/doc/gnupg/DETAILS +#usr/share/doc/gnupg/FAQ +#usr/share/doc/gnupg/HACKING +#usr/share/doc/gnupg/KEYSERVER +#usr/share/doc/gnupg/OpenPGP +#usr/share/doc/gnupg/README +#usr/share/doc/gnupg/TRANSLATE +#usr/share/doc/gnupg/examples +#usr/share/doc/gnupg/examples/Automatic.prf +#usr/share/doc/gnupg/examples/README +#usr/share/doc/gnupg/examples/VS-NfD.prf +#usr/share/doc/gnupg/examples/debug.prf +#usr/share/doc/gnupg/examples/gpgconf.conf +#usr/share/doc/gnupg/examples/pwpattern.list +#usr/share/doc/gnupg/examples/scd-event +#usr/share/doc/gnupg/examples/systemd-user +#usr/share/doc/gnupg/examples/systemd-user/README +#usr/share/doc/gnupg/examples/systemd-user/dirmngr.service +#usr/share/doc/gnupg/examples/systemd-user/dirmngr.socket +#usr/share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket +#usr/share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket +#usr/share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket +#usr/share/doc/gnupg/examples/systemd-user/gpg-agent.service +#usr/share/doc/gnupg/examples/systemd-user/gpg-agent.socket +#usr/share/doc/gnupg/examples/trustlist.txt #usr/share/gnupg -#usr/share/gnupg/FAQ -#usr/share/gnupg/options.skel -#usr/share/info/gnupg1.info -#usr/share/man/man1/gpg-zip.1 +#usr/share/gnupg/distsigkey.gpg +#usr/share/gnupg/help.be.txt +#usr/share/gnupg/help.ca.txt +#usr/share/gnupg/help.cs.txt +#usr/share/gnupg/help.da.txt +#usr/share/gnupg/help.de.txt +#usr/share/gnupg/help.el.txt +#usr/share/gnupg/help.eo.txt +#usr/share/gnupg/help.es.txt +#usr/share/gnupg/help.et.txt +#usr/share/gnupg/help.fi.txt +#usr/share/gnupg/help.fr.txt +#usr/share/gnupg/help.gl.txt +#usr/share/gnupg/help.hu.txt +#usr/share/gnupg/help.id.txt +#usr/share/gnupg/help.it.txt +#usr/share/gnupg/help.ja.txt +#usr/share/gnupg/help.nb.txt +#usr/share/gnupg/help.pl.txt +#usr/share/gnupg/help.pt.txt +#usr/share/gnupg/help.pt_BR.txt +#usr/share/gnupg/help.ro.txt +#usr/share/gnupg/help.ru.txt +#usr/share/gnupg/help.sk.txt +#usr/share/gnupg/help.sv.txt +#usr/share/gnupg/help.tr.txt +#usr/share/gnupg/help.txt +#usr/share/gnupg/help.zh_CN.txt +#usr/share/gnupg/help.zh_TW.txt +#usr/share/gnupg/sks-keyservers.netCA.pem +#usr/share/info/gnupg.info +#usr/share/info/gnupg.info-1 +#usr/share/info/gnupg.info-2 +#usr/share/man/man1/dirmngr-client.1 +#usr/share/man/man1/gpg-agent.1 +#usr/share/man/man1/gpg-connect-agent.1 +#usr/share/man/man1/gpg-preset-passphrase.1 +#usr/share/man/man1/gpg-wks-client.1 +#usr/share/man/man1/gpg-wks-server.1 #usr/share/man/man1/gpg.1 +#usr/share/man/man1/gpgconf.1 +#usr/share/man/man1/gpgparsemail.1 +#usr/share/man/man1/gpgsm.1 +#usr/share/man/man1/gpgtar.1 #usr/share/man/man1/gpgv.1 +#usr/share/man/man1/scdaemon.1 +#usr/share/man/man1/symcryptrun.1 +#usr/share/man/man1/watchgnupg.1 +#usr/share/man/man7/gnupg.7 +#usr/share/man/man8/addgnupghome.8 +#usr/share/man/man8/applygnupgdefaults.8 +#usr/share/man/man8/dirmngr.8 diff --git a/lfs/gnupg b/lfs/gnupg index f94948fe9..16effeaa2 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -24,7 +24,7 @@
include Config
-VER = 1.4.23 +VER = 2.2.27
THISAPP = gnupg-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b1df02c73572f27bc859ac05ff2259ab +$(DL_FILE)_MD5 = a9c002b5356103c97412955a1956ae0c
install : $(TARGET)
diff --git a/make.sh b/make.sh index 0c124ac81..a9d71768a 100755 --- a/make.sh +++ b/make.sh @@ -1311,6 +1311,8 @@ buildipfire() { lfsmake2 perl-Device-Modem lfsmake2 perl-Apache-Htpasswd lfsmake2 perl-Parse-Yapp + lfsmake2 libksba + lfsmake2 npth lfsmake2 gnupg lfsmake2 hdparm lfsmake2 sdparm
- libassuan required as a core program for gnupg 2.2 series - rootfile moved from packages to common - lfs adjusted to compile and install as core program
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/{packages => common}/libassuan | 0 lfs/libassuan | 6 ------ 2 files changed, 6 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%)
diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/common/libassuan similarity index 100% rename from config/rootfiles/packages/libassuan rename to config/rootfiles/common/libassuan diff --git a/lfs/libassuan b/lfs/libassuan index 4edb3fcb0..a89cab3a0 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -31,10 +31,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libassuan -PAK_VER = 6
-DEPS =
############################################################################### # Top-level Rules @@ -54,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ###############################################################################
- Installation of libksba required for build and use of gnupg 2.2 series
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/libksba | 9 ++++ lfs/libksba | 79 +++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 config/rootfiles/common/libksba create mode 100644 lfs/libksba
diff --git a/config/rootfiles/common/libksba b/config/rootfiles/common/libksba new file mode 100644 index 000000000..b23f58d92 --- /dev/null +++ b/config/rootfiles/common/libksba @@ -0,0 +1,9 @@ +#usr/bin/ksba-config +#usr/include/ksba.h +#usr/lib/libksba.la +#usr/lib/libksba.so +usr/lib/libksba.so.8 +usr/lib/libksba.so.8.13.0 +#usr/lib/pkgconfig/ksba.pc +#usr/share/aclocal/ksba.m4 +#usr/share/info/ksba.info diff --git a/lfs/libksba b/lfs/libksba new file mode 100644 index 000000000..335f4df2d --- /dev/null +++ b/lfs/libksba @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.5.0 + +THISAPP = libksba-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = a43bc51bd1bf13295623398d0f2d88b4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
- Installation of npth required for build and use of gnupg 2.2 series
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/npth | 7 ++++ lfs/npth | 79 ++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/npth
diff --git a/config/rootfiles/common/npth b/config/rootfiles/common/npth new file mode 100644 index 000000000..213f3cbe1 --- /dev/null +++ b/config/rootfiles/common/npth @@ -0,0 +1,7 @@ +#usr/bin/npth-config +#usr/include/npth.h +#usr/lib/libnpth.la +#usr/lib/libnpth.so +usr/lib/libnpth.so.0 +usr/lib/libnpth.so.0.1.2 +#usr/share/aclocal/npth.m4 diff --git a/lfs/npth b/lfs/npth new file mode 100644 index 000000000..f91c75592 --- /dev/null +++ b/lfs/npth @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6 + +THISAPP = npth-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 375d1a15ad969f32d25f1a7630929854 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
- Update from 1.3.2 (2012) to 1.15.1 (2021) - gpgme had failures when trying to build new version with legacy gnupg 1.4 branch. Successfully built with LTS gnupg 2.2 branch - Updated rootfile - Changelog has over 10k lines for changes between these versions. Full details can be found in ChangeLog file in source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/gpgme | 162 ++++++++++++++++++++++++++++++-- lfs/gpgme | 6 +- 2 files changed, 159 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/packages/gpgme b/config/rootfiles/packages/gpgme index 2a035231d..9a5586da0 100644 --- a/config/rootfiles/packages/gpgme +++ b/config/rootfiles/packages/gpgme @@ -1,15 +1,165 @@ usr/bin/gpgme-config +#usr/bin/gpgme-json +#usr/bin/gpgme-tool +#usr/include/gpgme++ +#usr/include/gpgme++/configuration.h +#usr/include/gpgme++/context.h +#usr/include/gpgme++/data.h +#usr/include/gpgme++/decryptionresult.h +#usr/include/gpgme++/defaultassuantransaction.h +#usr/include/gpgme++/editinteractor.h +#usr/include/gpgme++/encryptionresult.h +#usr/include/gpgme++/engineinfo.h +#usr/include/gpgme++/error.h +#usr/include/gpgme++/eventloopinteractor.h +#usr/include/gpgme++/exception.h +#usr/include/gpgme++/global.h +#usr/include/gpgme++/gpgadduserideditinteractor.h +#usr/include/gpgme++/gpgagentgetinfoassuantransaction.h +#usr/include/gpgme++/gpggencardkeyinteractor.h +#usr/include/gpgme++/gpgmefw.h +#usr/include/gpgme++/gpgmepp_export.h +#usr/include/gpgme++/gpgmepp_version.h +#usr/include/gpgme++/gpgsetexpirytimeeditinteractor.h +#usr/include/gpgme++/gpgsetownertrusteditinteractor.h +#usr/include/gpgme++/gpgsignkeyeditinteractor.h +#usr/include/gpgme++/importresult.h +#usr/include/gpgme++/interfaces +#usr/include/gpgme++/interfaces/assuantransaction.h +#usr/include/gpgme++/interfaces/dataprovider.h +#usr/include/gpgme++/interfaces/passphraseprovider.h +#usr/include/gpgme++/interfaces/progressprovider.h +#usr/include/gpgme++/interfaces/statusconsumer.h +#usr/include/gpgme++/key.h +#usr/include/gpgme++/keygenerationresult.h +#usr/include/gpgme++/keylistresult.h +#usr/include/gpgme++/notation.h +#usr/include/gpgme++/result.h +#usr/include/gpgme++/scdgetinfoassuantransaction.h +#usr/include/gpgme++/signingresult.h +#usr/include/gpgme++/statusconsumerassuantransaction.h +#usr/include/gpgme++/swdbresult.h +#usr/include/gpgme++/tofuinfo.h +#usr/include/gpgme++/trustitem.h +#usr/include/gpgme++/verificationresult.h +#usr/include/gpgme++/vfsmountresult.h #usr/include/gpgme.h -#usr/lib/libgpgme-pthread.la -usr/lib/libgpgme-pthread.so -usr/lib/libgpgme-pthread.so.11 -usr/lib/libgpgme-pthread.so.11.8.1 +#usr/lib/cmake/Gpgmepp +#usr/lib/cmake/Gpgmepp/GpgmeppConfig.cmake +#usr/lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake #usr/lib/libgpgme.la -usr/lib/libgpgme.so +#usr/lib/libgpgme.so usr/lib/libgpgme.so.11 -usr/lib/libgpgme.so.11.8.1 +usr/lib/libgpgme.so.11.24.1 +#usr/lib/libgpgmepp.la +#usr/lib/libgpgmepp.so +usr/lib/libgpgmepp.so.6 +usr/lib/libgpgmepp.so.6.12.1 +#usr/lib/pkgconfig/gpgme-glib.pc +#usr/lib/pkgconfig/gpgme.pc +#usr/lib/python2.7/site-packages/gpg +#usr/lib/python2.7/site-packages/gpg-1.15.1-py2.7.egg-info +#usr/lib/python2.7/site-packages/gpg/__init__.py +#usr/lib/python2.7/site-packages/gpg/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/_gpgme.so +#usr/lib/python2.7/site-packages/gpg/callbacks.py +#usr/lib/python2.7/site-packages/gpg/callbacks.pyc +#usr/lib/python2.7/site-packages/gpg/constants +#usr/lib/python2.7/site-packages/gpg/constants/__init__.py +#usr/lib/python2.7/site-packages/gpg/constants/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/constants/create.py +#usr/lib/python2.7/site-packages/gpg/constants/create.pyc +#usr/lib/python2.7/site-packages/gpg/constants/data +#usr/lib/python2.7/site-packages/gpg/constants/data/__init__.py +#usr/lib/python2.7/site-packages/gpg/constants/data/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/constants/data/encoding.py +#usr/lib/python2.7/site-packages/gpg/constants/data/encoding.pyc +#usr/lib/python2.7/site-packages/gpg/constants/event.py +#usr/lib/python2.7/site-packages/gpg/constants/event.pyc +#usr/lib/python2.7/site-packages/gpg/constants/import_type.py +#usr/lib/python2.7/site-packages/gpg/constants/import_type.pyc +#usr/lib/python2.7/site-packages/gpg/constants/keylist +#usr/lib/python2.7/site-packages/gpg/constants/keylist/__init__.py +#usr/lib/python2.7/site-packages/gpg/constants/keylist/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/constants/keylist/mode.py +#usr/lib/python2.7/site-packages/gpg/constants/keylist/mode.pyc +#usr/lib/python2.7/site-packages/gpg/constants/keysign.py +#usr/lib/python2.7/site-packages/gpg/constants/keysign.pyc +#usr/lib/python2.7/site-packages/gpg/constants/md.py +#usr/lib/python2.7/site-packages/gpg/constants/md.pyc +#usr/lib/python2.7/site-packages/gpg/constants/pk.py +#usr/lib/python2.7/site-packages/gpg/constants/pk.pyc +#usr/lib/python2.7/site-packages/gpg/constants/protocol.py +#usr/lib/python2.7/site-packages/gpg/constants/protocol.pyc +#usr/lib/python2.7/site-packages/gpg/constants/sig +#usr/lib/python2.7/site-packages/gpg/constants/sig/__init__.py +#usr/lib/python2.7/site-packages/gpg/constants/sig/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/constants/sig/mode.py +#usr/lib/python2.7/site-packages/gpg/constants/sig/mode.pyc +#usr/lib/python2.7/site-packages/gpg/constants/sig/notation.py +#usr/lib/python2.7/site-packages/gpg/constants/sig/notation.pyc +#usr/lib/python2.7/site-packages/gpg/constants/sigsum.py +#usr/lib/python2.7/site-packages/gpg/constants/sigsum.pyc +#usr/lib/python2.7/site-packages/gpg/constants/status.py +#usr/lib/python2.7/site-packages/gpg/constants/status.pyc +#usr/lib/python2.7/site-packages/gpg/constants/tofu +#usr/lib/python2.7/site-packages/gpg/constants/tofu/__init__.py +#usr/lib/python2.7/site-packages/gpg/constants/tofu/__init__.pyc +#usr/lib/python2.7/site-packages/gpg/constants/tofu/policy.py +#usr/lib/python2.7/site-packages/gpg/constants/tofu/policy.pyc +#usr/lib/python2.7/site-packages/gpg/constants/validity.py +#usr/lib/python2.7/site-packages/gpg/constants/validity.pyc +#usr/lib/python2.7/site-packages/gpg/core.py +#usr/lib/python2.7/site-packages/gpg/core.pyc +#usr/lib/python2.7/site-packages/gpg/errors.py +#usr/lib/python2.7/site-packages/gpg/errors.pyc +#usr/lib/python2.7/site-packages/gpg/gpgme.py +#usr/lib/python2.7/site-packages/gpg/gpgme.pyc +#usr/lib/python2.7/site-packages/gpg/results.py +#usr/lib/python2.7/site-packages/gpg/results.pyc +#usr/lib/python2.7/site-packages/gpg/util.py +#usr/lib/python2.7/site-packages/gpg/util.pyc +#usr/lib/python2.7/site-packages/gpg/version.py +#usr/lib/python2.7/site-packages/gpg/version.pyc +#usr/lib/python3.8/site-packages/gpg +#usr/lib/python3.8/site-packages/gpg-1.15.1-py3.8.egg-info +#usr/lib/python3.8/site-packages/gpg/__init__.py +#usr/lib/python3.8/site-packages/gpg/_gpgme.cpython-38-x86_64-linux-gnu.so +#usr/lib/python3.8/site-packages/gpg/callbacks.py +#usr/lib/python3.8/site-packages/gpg/constants +#usr/lib/python3.8/site-packages/gpg/constants/__init__.py +#usr/lib/python3.8/site-packages/gpg/constants/create.py +#usr/lib/python3.8/site-packages/gpg/constants/data +#usr/lib/python3.8/site-packages/gpg/constants/data/__init__.py +#usr/lib/python3.8/site-packages/gpg/constants/data/encoding.py +#usr/lib/python3.8/site-packages/gpg/constants/event.py +#usr/lib/python3.8/site-packages/gpg/constants/import_type.py +#usr/lib/python3.8/site-packages/gpg/constants/keylist +#usr/lib/python3.8/site-packages/gpg/constants/keylist/__init__.py +#usr/lib/python3.8/site-packages/gpg/constants/keylist/mode.py +#usr/lib/python3.8/site-packages/gpg/constants/keysign.py +#usr/lib/python3.8/site-packages/gpg/constants/md.py +#usr/lib/python3.8/site-packages/gpg/constants/pk.py +#usr/lib/python3.8/site-packages/gpg/constants/protocol.py +#usr/lib/python3.8/site-packages/gpg/constants/sig +#usr/lib/python3.8/site-packages/gpg/constants/sig/__init__.py +#usr/lib/python3.8/site-packages/gpg/constants/sig/mode.py +#usr/lib/python3.8/site-packages/gpg/constants/sig/notation.py +#usr/lib/python3.8/site-packages/gpg/constants/sigsum.py +#usr/lib/python3.8/site-packages/gpg/constants/status.py +#usr/lib/python3.8/site-packages/gpg/constants/tofu +#usr/lib/python3.8/site-packages/gpg/constants/tofu/__init__.py +#usr/lib/python3.8/site-packages/gpg/constants/tofu/policy.py +#usr/lib/python3.8/site-packages/gpg/constants/validity.py +#usr/lib/python3.8/site-packages/gpg/core.py +#usr/lib/python3.8/site-packages/gpg/errors.py +#usr/lib/python3.8/site-packages/gpg/gpgme.py +#usr/lib/python3.8/site-packages/gpg/results.py +#usr/lib/python3.8/site-packages/gpg/util.py +#usr/lib/python3.8/site-packages/gpg/version.py #usr/share/aclocal/gpgme.m4 usr/share/common-lisp/source/gpgme +usr/share/common-lisp/source/gpgme/gpgme-grovel.lisp usr/share/common-lisp/source/gpgme/gpgme-package.lisp usr/share/common-lisp/source/gpgme/gpgme.asd usr/share/common-lisp/source/gpgme/gpgme.lisp diff --git a/lfs/gpgme b/lfs/gpgme index a6056fc8e..bb5ecd570 100644 --- a/lfs/gpgme +++ b/lfs/gpgme @@ -24,7 +24,7 @@
include Config
-VER = 1.3.2 +VER = 1.15.1
THISAPP = gpgme-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = gpgme -PAK_VER = 2 +PAK_VER = 3
DEPS = libassuan
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 326fe97077141713f0930aa87949a287 +$(DL_FILE)_MD5 = e086c4575fe4d7840864fb7dfe97f692
install : $(TARGET)
Hello,
Thank you for working on this.
On 4 Apr 2021, at 12:10, Adolf Belka adolf.belka@ipfire.org wrote:
This is the patch series for the update of gnupg from the legacy 1.4 branch to the LTS 2.2 branch.
Required for build and use are libassuan New requirement for 2.2 branch - change from addon to Core program libksba New requirement for 2.2 branch - new install npth New requirement for 2.2 branch - new install
pinentry not required for build. Is required for some uses of gnupg such as when providing passwords. This does not apply the the IPFire use cases.
Trying to update gpgme with the old 1.4 branch gnupg resulted in various fails. Was looking for files that were not present. Updating gpgme with 2.2 branch of gnupg was successful.
The iso created from the build of all the changes from this patch series was installed in my vm testbed. Keys successfully imported. Package lists successfully read and put into pakfire wui page. Several addons installed successfully. Packages had signatures successfully verified. My testing indicates that gnupg 2.2 branch is successfully working in IPFire in place of the 1.4 branch
That sounds very good.
What is the migration path? Can the new version read the old key store or do we have to do something about this first?
-Michael
Adolf Belka (5): gnupg: Update to 2.2.27 libassuan: Convert from addon to core program libksba: required for gnupg 2.2 series npth: required for gnupg 2.2 series gpgme: Update to 1.15.1
config/rootfiles/common/gnupg | 107 ++++++++++-- .../rootfiles/{packages => common}/libassuan | 0 config/rootfiles/common/libksba | 9 + config/rootfiles/common/npth | 7 + config/rootfiles/packages/gpgme | 162 +++++++++++++++++- lfs/gnupg | 4 +- lfs/gpgme | 6 +- lfs/libassuan | 6 - lfs/libksba | 79 +++++++++ lfs/npth | 79 +++++++++ make.sh | 2 + 11 files changed, 434 insertions(+), 27 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%) create mode 100644 config/rootfiles/common/libksba create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/libksba create mode 100644 lfs/npth
-- 2.31.1
Hi Michael,
On 06/04/2021 12:38, Michael Tremer wrote:
Hello,
Thank you for working on this.
On 4 Apr 2021, at 12:10, Adolf Belka adolf.belka@ipfire.org wrote:
This is the patch series for the update of gnupg from the legacy 1.4 branch to the LTS 2.2 branch.
Required for build and use are libassuan New requirement for 2.2 branch - change from addon to Core program libksba New requirement for 2.2 branch - new install npth New requirement for 2.2 branch - new install
pinentry not required for build. Is required for some uses of gnupg such as when providing passwords. This does not apply the the IPFire use cases.
Trying to update gpgme with the old 1.4 branch gnupg resulted in various fails. Was looking for files that were not present. Updating gpgme with 2.2 branch of gnupg was successful.
The iso created from the build of all the changes from this patch series was installed in my vm testbed. Keys successfully imported. Package lists successfully read and put into pakfire wui page. Several addons installed successfully. Packages had signatures successfully verified. My testing indicates that gnupg 2.2 branch is successfully working in IPFire in place of the 1.4 branch
That sounds very good.
I was surprised how well it went after I had sorted out all the additional dependency programs.
What is the migration path? Can the new version read the old key store or do we have to do something about this first?
My testing was only for installing from scratch using the iso. That seemed to work fine and successfully imported the keys, created the list of available packages and then successfully verified the addons I installed. As this is a big change it definitely would be good to have other people test out that what I found is generally applicable.
For migration with the Core Update, I don't know what might be needed. I was not able to test this out on my vm testbed. If the changes are merged then I, and others, could do an upgrade to unstable which should highlight if there are any problems with the migration for a Core Update. I don't have any other ideas beyond that for testing out the migration path required.
Regards, Adolf.
-Michael
Adolf Belka (5): gnupg: Update to 2.2.27 libassuan: Convert from addon to core program libksba: required for gnupg 2.2 series npth: required for gnupg 2.2 series gpgme: Update to 1.15.1
config/rootfiles/common/gnupg | 107 ++++++++++-- .../rootfiles/{packages => common}/libassuan | 0 config/rootfiles/common/libksba | 9 + config/rootfiles/common/npth | 7 + config/rootfiles/packages/gpgme | 162 +++++++++++++++++- lfs/gnupg | 4 +- lfs/gpgme | 6 +- lfs/libassuan | 6 - lfs/libksba | 79 +++++++++ lfs/npth | 79 +++++++++ make.sh | 2 + 11 files changed, 434 insertions(+), 27 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%) create mode 100644 config/rootfiles/common/libksba create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/libksba create mode 100644 lfs/npth
-- 2.31.1
Hello,
On 6 Apr 2021, at 13:09, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 06/04/2021 12:38, Michael Tremer wrote:
Hello, Thank you for working on this.
On 4 Apr 2021, at 12:10, Adolf Belka adolf.belka@ipfire.org wrote:
This is the patch series for the update of gnupg from the legacy 1.4 branch to the LTS 2.2 branch.
Required for build and use are libassuan New requirement for 2.2 branch - change from addon to Core program libksba New requirement for 2.2 branch - new install npth New requirement for 2.2 branch - new install
pinentry not required for build. Is required for some uses of gnupg such as when providing passwords. This does not apply the the IPFire use cases.
Trying to update gpgme with the old 1.4 branch gnupg resulted in various fails. Was looking for files that were not present. Updating gpgme with 2.2 branch of gnupg was successful.
The iso created from the build of all the changes from this patch series was installed in my vm testbed. Keys successfully imported. Package lists successfully read and put into pakfire wui page. Several addons installed successfully. Packages had signatures successfully verified. My testing indicates that gnupg 2.2 branch is successfully working in IPFire in place of the 1.4 branch
That sounds very good.
I was surprised how well it went after I had sorted out all the additional dependency programs.
What is the migration path? Can the new version read the old key store or do we have to do something about this first?
My testing was only for installing from scratch using the iso. That seemed to work fine and successfully imported the keys, created the list of available packages and then successfully verified the addons I installed. As this is a big change it definitely would be good to have other people test out that what I found is generally applicable.
For migration with the Core Update, I don't know what might be needed. I was not able to test this out on my vm testbed. If the changes are merged then I, and others, could do an upgrade to unstable which should highlight if there are any problems with the migration for a Core Update. I don't have any other ideas beyond that for testing out the migration path required.
Basically to install these packages on a system that has been installed with the older version. I would like to avoid doing this in the next tree, because if things go wrong, we will break systems of all testers.
-Michael
Regards, Adolf.
-Michael
Adolf Belka (5): gnupg: Update to 2.2.27 libassuan: Convert from addon to core program libksba: required for gnupg 2.2 series npth: required for gnupg 2.2 series gpgme: Update to 1.15.1
config/rootfiles/common/gnupg | 107 ++++++++++-- .../rootfiles/{packages => common}/libassuan | 0 config/rootfiles/common/libksba | 9 + config/rootfiles/common/npth | 7 + config/rootfiles/packages/gpgme | 162 +++++++++++++++++- lfs/gnupg | 4 +- lfs/gpgme | 6 +- lfs/libassuan | 6 - lfs/libksba | 79 +++++++++ lfs/npth | 79 +++++++++ make.sh | 2 + 11 files changed, 434 insertions(+), 27 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%) create mode 100644 config/rootfiles/common/libksba create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/libksba create mode 100644 lfs/npth
-- 2.31.1
Hi Michael,
On 06/04/2021 15:40, Michael Tremer wrote:
Hello,
On 6 Apr 2021, at 13:09, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 06/04/2021 12:38, Michael Tremer wrote:
Hello, Thank you for working on this.
On 4 Apr 2021, at 12:10, Adolf Belka adolf.belka@ipfire.org wrote:
This is the patch series for the update of gnupg from the legacy 1.4 branch to the LTS 2.2 branch.
Required for build and use are libassuan New requirement for 2.2 branch - change from addon to Core program libksba New requirement for 2.2 branch - new install npth New requirement for 2.2 branch - new install
pinentry not required for build. Is required for some uses of gnupg such as when providing passwords. This does not apply the the IPFire use cases.
Trying to update gpgme with the old 1.4 branch gnupg resulted in various fails. Was looking for files that were not present. Updating gpgme with 2.2 branch of gnupg was successful.
The iso created from the build of all the changes from this patch series was installed in my vm testbed. Keys successfully imported. Package lists successfully read and put into pakfire wui page. Several addons installed successfully. Packages had signatures successfully verified. My testing indicates that gnupg 2.2 branch is successfully working in IPFire in place of the 1.4 branch
That sounds very good.
I was surprised how well it went after I had sorted out all the additional dependency programs.
What is the migration path? Can the new version read the old key store or do we have to do something about this first?
My testing was only for installing from scratch using the iso. That seemed to work fine and successfully imported the keys, created the list of available packages and then successfully verified the addons I installed. As this is a big change it definitely would be good to have other people test out that what I found is generally applicable.
For migration with the Core Update, I don't know what might be needed. I was not able to test this out on my vm testbed. If the changes are merged then I, and others, could do an upgrade to unstable which should highlight if there are any problems with the migration for a Core Update. I don't have any other ideas beyond that for testing out the migration path required.
Basically to install these packages on a system that has been installed with the older version. I would like to avoid doing this in the next tree, because if things go wrong, we will break systems of all testers.
I am happy to do that and it sounds like a very good idea but someone needs to help me with how to do that.
Probably I am missing something obvious but the only way I know of installing packages onto an existing system is via the pakfire menu when doing a Core Update but I can't do that as it takes the files from the IPFire server and we want to test this before they go onto the IPFire server.
Regards, Adolf
-Michael
Regards, Adolf.
-Michael
Adolf Belka (5): gnupg: Update to 2.2.27 libassuan: Convert from addon to core program libksba: required for gnupg 2.2 series npth: required for gnupg 2.2 series gpgme: Update to 1.15.1
config/rootfiles/common/gnupg | 107 ++++++++++-- .../rootfiles/{packages => common}/libassuan | 0 config/rootfiles/common/libksba | 9 + config/rootfiles/common/npth | 7 + config/rootfiles/packages/gpgme | 162 +++++++++++++++++- lfs/gnupg | 4 +- lfs/gpgme | 6 +- lfs/libassuan | 6 - lfs/libksba | 79 +++++++++ lfs/npth | 79 +++++++++ make.sh | 2 + 11 files changed, 434 insertions(+), 27 deletions(-) rename config/rootfiles/{packages => common}/libassuan (100%) create mode 100644 config/rootfiles/common/libksba create mode 100644 config/rootfiles/common/npth create mode 100644 lfs/libksba create mode 100644 lfs/npth
-- 2.31.1
-
Adolf Belka -
Michael Tremer