Remove dependency on libdpkg

API of libdpkg is unstable and its usage is discouraged for purposes other than internal. It also prevents building libaktualizr as a shared library. As getInstalledPackages() functionality of debian package manager seems to be unused, we will avoid reimplementing it for now. Signed-off-by: Eugene Smirnov <[email protected]>
advancedtelematic · Jul 26, 2019 · c8275eb · c8275eb
1 parent 84c2ebd
commit c8275eb
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 58 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,12 +119,6 @@ else(BUILD_OSTREE)
     unset(LIBOSTREE_LIBRARIES CACHE)
 endif(BUILD_OSTREE)
 
-if(BUILD_DEB)
-    pkg_check_modules(LIBDPKG REQUIRED libdpkg)
-else(BUILD_DEB)
-    unset(LIBDPKG_LIBRARIES CACHE)
-endif(BUILD_DEB)
-
 if(BUILD_DOCKERAPP)
     add_definitions(-DBUILD_DOCKERAPP)
 endif(BUILD_DOCKERAPP)
@@ -377,7 +371,6 @@ set (AKTUALIZR_EXTERNAL_LIBS
     ${SQLITE3_LIBRARIES}
     ${LibArchive_LIBRARIES}
     ${LIBP11_LIBRARIES}
-    ${LIBDPKG_LIBRARIES}
     ${GLIB2_LIBRARIES}
     ${SYSTEMD_LIBRARY}
     ${ZLIB_LIBRARY})

diff --git a/README.adoc b/README.adoc
@@ -65,7 +65,6 @@ Some features also require additional packages:
 * For PKCS#11 support, you will need `libp11-2 libp11-dev`.
 * For systemd support for secondaries, you will need `libsystemd-dev`.
 * For fault injection, you will need `fiu-utils libfiu-dev`.
-* For Debian packagin support, you will need `libdpkg-dev`.
 
 ==== Mac support
 

diff --git a/docker/Dockerfile.debian.testing b/docker/Dockerfile.debian.testing
@@ -19,7 +19,6 @@ RUN apt-get update && apt-get -y install --no-install-suggests --no-install-reco
   cmake \
   curl \
   doxygen \
-  dpkg-dev \
   e2fslibs-dev \
   g++ \
   gcc \
@@ -34,7 +33,6 @@ RUN apt-get update && apt-get -y install --no-install-suggests --no-install-reco
   libboost-test-dev \
   libboost-thread-dev \
   libcurl4-openssl-dev \
-  libdpkg-dev \
   libengine-pkcs11-openssl \
   libexpat1-dev \
   libfuse-dev \

diff --git a/docker/Dockerfile.ubuntu.bionic b/docker/Dockerfile.ubuntu.bionic
@@ -30,7 +30,6 @@ RUN apt-get update && apt-get -y install --no-install-suggests --no-install-reco
   libboost-test-dev \
   libboost-thread-dev \
   libcurl4-openssl-dev \
-  libdpkg-dev \
   libengine-pkcs11-openssl \
   libexpat1-dev \
   libffi-dev \

diff --git a/docker/Dockerfile.ubuntu.xenial b/docker/Dockerfile.ubuntu.xenial
@@ -30,7 +30,6 @@ RUN apt-get update && apt-get -y install --no-install-suggests --no-install-reco
   libboost-test-dev \
   libboost-thread-dev \
   libcurl4-openssl-dev \
-  libdpkg-dev \
   libengine-pkcs11-openssl \
   libexpat1-dev \
   libffi-dev \

diff --git a/src/libaktualizr/package_manager/CMakeLists.txt b/src/libaktualizr/package_manager/CMakeLists.txt
@@ -17,9 +17,6 @@ add_aktualizr_test(NAME packagemanagerfake SOURCES packagemanagerfake_test.cc)
 # Debian backend
 if(BUILD_DEB)
     set_property(SOURCE packagemanagerfactory.cc packagemanagerfactory_test.cc PROPERTY COMPILE_DEFINITIONS BUILD_DEB)
-    if (${LIBDPKG_VERSION} VERSION_GREATER "1.19.3")
-        set_property(SOURCE debianmanager.cc PROPERTY COMPILE_DEFINITIONS LIBDPKG_V011903)
-    endif()
     target_sources(package_manager PRIVATE debianmanager.cc)
     add_executable(t_packagemanager_deb EXCLUDE_FROM_ALL debianmanager_test.cc)
     add_dependencies(build_tests t_packagemanager_deb)

diff --git a/src/libaktualizr/package_manager/debianmanager.cc b/src/libaktualizr/package_manager/debianmanager.cc
@@ -1,37 +1,11 @@
 #include "package_manager/debianmanager.h"
 
-#define LIBDPKG_VOLATILE_API 1
-#include <dpkg/dpkg-db.h>
-#include <dpkg/dpkg.h>
-#include <dpkg/pkg-array.h>
-#include <dpkg/pkg-show.h>
 #include <stdio.h>
 #include <unistd.h>
 
 Json::Value DebianManager::getInstalledPackages() const {
-  Json::Value packages(Json::arrayValue);
-  struct pkg_array array {};
-  dpkg_program_init("a.out");
-  modstatdb_open(msdbrw_available_readonly);
-
-#ifdef LIBDPKG_V011903
-  pkg_array_init_from_hash(&array);
-#else
-  pkg_array_init_from_db(&array);
-#endif
-  pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch);
-  for (int i = 0; i < array.n_pkgs; ++i) {
-    // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
-    struct pkginfo *pkg = array.pkgs[i];
-    if (pkg->status == PKG_STAT_INSTALLED) {
-      Json::Value package;
-      package["name"] = pkg_name(pkg, pnaw_nonambig);
-      package["version"] = versiondescribe(&pkg->installed.version, vdew_nonambig);
-      packages.append(package);
-    }
-  }
-  dpkg_program_done();
-  return packages;
+  // Currently not implemented
+  return Json::Value(Json::arrayValue);
 }
 
 data::InstallationResult DebianManager::install(const Uptane::Target &target) const {

diff --git a/src/load_tests/CMakeLists.txt b/src/load_tests/CMakeLists.txt
@@ -34,8 +34,7 @@ if (BUILD_LOAD_TESTS)
             ${LIBOSTREE_LIBRARIES}
             ${LIBP11_LIBRARIES}
             ${SQLITE3_LIBRARIES}
-            ${SYSTEMD_LIBRARY}
-            ${LIBDPKG_LIBRARIES})
+            ${SYSTEMD_LIBRARY})
 
     install(TARGETS ota-load-tests
             COMPONENT aktualizr

diff --git a/thirdparty.spdx b/thirdparty.spdx
@@ -18,7 +18,6 @@ Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-sqlite3
 Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-asn1c
 Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-libp11
 Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-systemd
-Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-dpkg
 
 
 PackageName: googletest
@@ -209,18 +208,6 @@ FilesAnalyzed: false
 PackageComment: <text>Dynamically linked.</text>
 
 
-PackageName: dpkg
-SPDXID: SPDXRef-dpkg
-PackageDownloadLocation: http://http.debian.net/debian/pool/main/d/dpkg/dpkg_1.19.0.5.tar.xz
-PackageHomePage: https://packages.debian.org/source/sid/dpkg
-PackageLicenseConcluded: GPL-2.0-or-later
-PackageLicenseDeclared: GPL-2.0-or-later
-PackageLicenseInfoFromFiles: GPL-2.0-or-later
-PackageCopyrightText: <text>NONE</text>
-FilesAnalyzed: false
-PackageComment: <text>Dynamically linked.</text>
-
-
 PackageName: systemd
 SPDXID: SPDXRef-systemd
 PackageDownloadLocation: https://github.com/systemd/systemd/archive/v238.tar.gz