Skip to content

Commit 1649796

Browse files
jroheljan-kolarik
jrohel
authored and
jan-kolarik
committed
PGP: Use new librepo PGP API, remove gpgme dependency
Libdnf assumed that librepo internally uses gpgme for PGP keyring. Libdnf used the librepo keyring directly via gpgme instead of using the librepo API. It had to, the librepo API was insufficient. Librepo in version 1.15.0 extended the PGP API. This commmit uses the extended librepo PGP API and removes libdnf's dependency on gpgme. This is importand because a newer librepo may internally use a different PGP implementation than gpgme. The code was backported from libdnf5.
1 parent 998efa8 commit 1649796

File tree

7 files changed

+54
-611
lines changed

7 files changed

+54
-611
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ endif()
5151

5252

5353
# build dependencies
54-
find_package(Gpgme REQUIRED)
5554
find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext)
5655

5756

@@ -62,7 +61,7 @@ include_directories(${GLIB_INCLUDE_DIRS})
6261
pkg_check_modules(JSONC REQUIRED json-c)
6362
include_directories(${JSONC_INCLUDE_DIRS})
6463
pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0>=2.11.2)
65-
pkg_check_modules(REPO REQUIRED librepo>=1.13.0)
64+
pkg_check_modules(REPO REQUIRED librepo>=1.15.0)
6665
include_directories(${REPO_INCLUDE_DIRS})
6766
link_directories(${REPO_LIBRARY_DIRS})
6867
pkg_check_modules(RPM REQUIRED rpm>=4.15.0)
@@ -131,9 +130,6 @@ add_definitions(-DLIBDNF_UNSTABLE_API)
131130
add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\")
132131
add_definitions(-DG_LOG_DOMAIN=\\"libdnf\\")
133132

134-
# gpgme: LargeFile Support is required on 32bit architectures
135-
add_definitions(-D_FILE_OFFSET_BITS=64)
136-
137133
# tests
138134
add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\")
139135

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Building for Fedora
2020

2121
To install build requirements, run following command:
2222

23-
dnf install check-devel cmake cppunit-devel gcc gcc-c++ glib2-devel gpgme-devel gtk-doc json-c-devel libmodulemd-devel librepo-devel libsolv-devel libsolv-tools make python2-devel python3-devel python2-sphinx python3-sphinx python2-breathe python3-breathe rpm-devel sqlite-devel swig libsmartcols-devel
23+
dnf install check-devel cmake cppunit-devel gcc gcc-c++ glib2-devel gtk-doc json-c-devel libmodulemd-devel librepo-devel libsolv-devel libsolv-tools make python2-devel python3-devel python2-sphinx python3-sphinx python2-breathe python3-breathe rpm-devel sqlite-devel swig libsmartcols-devel
2424

2525
From the checkout dir:
2626

0 commit comments

Comments
 (0)