groups/231.native_packages_etc.group: tdnf: Update to v2.1.1

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

4 files changed, 54 insertions, 137 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 43a13ce1..be5abbf8 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -284,13 +284,10 @@ zstd")";
 : ${PKG_TCL_VERSION:=8.7a1};
 : ${PKG_TCL_URL:=http://kuiper.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/tcl8_7/tcl${PKG_TCL_VERSION}-src.tar.gz};
 : ${PKG_TCL_SUBDIR:=tcl${PKG_TCL_VERSION}/unix};
-: ${PKG_TDNF_DEPENDS:="curl libsolv"};
-: ${PKG_TDNF_SHA256SUM:=ccab50046405d8cd5d4fd5b7154686170311184e63d8bb541b2792e280fee97f};
-: ${PKG_TDNF_VERSION:=2.0.0-alpha.1};
-: ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}.tar.gz};
-: ${PKG_TDNF_CONFIGURE_ARGS_EXTRA:="--disable-static"};
-: ${PKG_TDNF_ENV_VARS_EXTRA:="LIBSOLV_LIBS=-lsolv:LIBSOLVEXT_LIBS=-lsolvext"};
-: ${PKG_TDNF_FORCE_AUTORECONF:=1};
+: ${PKG_TDNF_DEPENDS:="libmetalink libressl curl gpgme libsolv"};
+: ${PKG_TDNF_SHA256SUM:=1ca20b176939f32c212f8dec7bfacd99995f1cb16c7f176b90394378ea854b0b};
+: ${PKG_TDNF_VERSION:=2.1.1};
+: ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}/tdnf-${PKG_TDNF_VERSION}.tar.gz};
 : ${PKG_TDNF_IN_TREE:=1};
 : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}};
 : ${PKG_TEXINFO_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa};
diff --git a/patches/tdnf-2.0.0-alpha.1_pre.local.patch b/patches/tdnf-2.0.0-alpha.1_pre.local.patch
deleted file mode 100644
index bfacd87b..00000000
--- a/patches/tdnf-2.0.0-alpha.1_pre.local.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From f2fe2c648454bc5885366c93d4075ca5777ddbda Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Sun, 29 Apr 2018 15:52:26 -0400
-Subject: [PATCH] Fix TDNF build configuration to use pkgconfig data to find
- dependencies
-
-With the notable exception of identifying that we're using rpm.org rpm,
-all the configuration of how to use dependencies to compile and link
-TDNF and its libraries should come from pkgconfig. That way, TDNF
-will reliably build across more platforms.
-
-In addition, trivial changes to drop -Werror and specify that -std=gnu99
-is required for the build are included so that it will compile properly
-on compilers that do not default to newer C standards and not make
-assumptions about what is coerced from a warning to an error by default.
----
- client/Makefile.am  |  5 ++---
- configure.ac        | 25 +++++++++++++------------
- solv/Makefile.am    |  4 ++--
- tdnf-cli-libs.pc.in |  2 +-
- tdnf.pc.in          |  2 +-
- 5 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/client/Makefile.am b/client/Makefile.am
-index 9bd3deb..6857c3f 100644
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -26,6 +26,5 @@ libtdnf_la_LIBADD =  \
-     @top_builddir@/solv/libtdnfsolv.la \
-     $(top_builddir)/common/libcommon.la \
-     @LIBCURL_LIBS@ \
--    -lrpm  \
--    -lsolv \
--    -lsolvext
-+    @RPM_LIBS@ \
-+    @LIBSOLVEXT_LIBS@
-diff --git a/configure.ac b/configure.ac
-index d78bb8c..d5c4a51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@ AC_INIT(tdnf, 2.0.0)
- AC_MSG_NOTICE([tdnf configuration])
- 
- AC_CANONICAL_SYSTEM
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall foreign])
- 
- AC_CONFIG_TESTDIR(tests)
- 
-@@ -15,29 +15,30 @@ AC_PROG_LIBTOOL
- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_GNU_SOURCE -fPIC"
- 
- AM_CPPFLAGS="$AM_CPPFLAGS -I${top_srcdir}/include"
--AM_CFLAGS="$AM_CFLAGS -Wall -Werror -fno-strict-aliasing"
-+AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wall -fno-strict-aliasing"
- 
- CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_GNU_SOURCE -fPIC"
- AC_SUBST(AM_CPPFLAGS)
- AC_SUBST(AM_CFLAGS)
- 
- #libsolv
--echo "Looking for libsolv headers"
--AC_CHECK_HEADERS(solv/pool.h)
-+PKG_CHECK_MODULES([LIBSOLV], [libsolv], [have_libsolv=yes], [have_libsolv=no])
-+PKG_CHECK_MODULES([LIBSOLVEXT], [libsolvext], [have_libsolvext=yes], [have_libsolvext=no])
-+AM_CONDITIONAL([LIBSOLV],  [test "$have_libsolv" = "yes"])
-+AM_CONDITIONAL([LIBSOLVEXT],  [test "$have_libsolvext" = "yes"])
- 
--echo "Looking for libsolv libs"
--AC_CHECK_LIB(solv, pool_create)
--
--#licurl
-+#libcurl
- PKG_CHECK_MODULES([LIBCURL], [libcurl], [have_libcurl=yes], [have_libcurl=no])
- AM_CONDITIONAL([LIBCURL],  [test "$have_libcurl" = "yes"])
- 
- #rpm
--echo "Looking for librpm headers"
--AC_CHECK_HEADERS(rpm/rpmlib.h)
-+PKG_CHECK_MODULES([RPM], [rpm], [have_rpm=yes], [have_rpm=no])
-+AM_CONDITIONAL([RPM], [test "$have_rpm" = "yes"])
-+
-+# test to prove rpm.org rpm
-+echo "Looking for rpm.org librpm headers"
-+AC_CHECK_HEADERS(rpm/header.h)
- 
--echo "Looking for librpm libs"
--AC_CHECK_LIB(rpm, rpmtsCreate)
- 
- #makefiles
- AC_CONFIG_FILES([Makefile
-diff --git a/solv/Makefile.am b/solv/Makefile.am
-index 6625b3b..ef546a9 100644
---- a/solv/Makefile.am
-+++ b/solv/Makefile.am
-@@ -10,5 +10,5 @@ libtdnfsolv_la_SOURCES = \
-     
- libtdnfsolv_la_LDFLAGS =  \
-     -static \
--    -lrpm  \
--    -lsolv
-+    @RPM_LIBS@ \
-+    @LIBSOLV_LIBS@
-diff --git a/tdnf-cli-libs.pc.in b/tdnf-cli-libs.pc.in
-index 0912b68..4523e4d 100644
---- a/tdnf-cli-libs.pc.in
-+++ b/tdnf-cli-libs.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@/tdnf
- Name: tdnf-cli-libs
- Description: tdnf cli libs
- Version: @VERSION@
--Requires:
-+Requires: tdnf
- Libs: -L${libdir} -ltdnfcli
- Cflags: -I${includedir}
-diff --git a/tdnf.pc.in b/tdnf.pc.in
-index 811568d..4ad7a07 100644
---- a/tdnf.pc.in
-+++ b/tdnf.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@/tdnf
- Name: tdnf
- Description: tiny dandified yum
- Version: @VERSION@
--Requires:libsolv rpm
-+Requires: libsolv libsolvext rpm libcurl
- Libs: -L${libdir} -ltdnf
- Cflags: -I${includedir}
--- 
-2.17.0
-
diff --git a/patches/tdnf-2.1.1_pre.local.patch b/patches/tdnf-2.1.1_pre.local.patch
new file mode 100644
index 00000000..52459566
--- /dev/null
+++ b/patches/tdnf-2.1.1_pre.local.patch
@@ -0,0 +1,28 @@
+From 047b306ec03d4d83c66653f75de448e697cb8c0c Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Fri, 29 May 2020 19:17:58 -0400
+Subject: [PATCH] CMakeLists: Disable building Python stuff for now
+
+We do not need the Python bindings at the moment...
+
+Signed-off-by: Neal Gompa <ngompa13@gmail.com>
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 25ee54e..b126bb0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,8 +66,6 @@ set(LIB_TDNF_CLI tdnfcli)
+ add_subdirectory("${PROJECT_SOURCE_DIR}/common")
+ add_subdirectory("${PROJECT_SOURCE_DIR}/client")
+ add_subdirectory("${PROJECT_SOURCE_DIR}/plugins")
+-add_subdirectory("${PROJECT_SOURCE_DIR}/python")
+ add_subdirectory("${PROJECT_SOURCE_DIR}/resources")
+ add_subdirectory("${PROJECT_SOURCE_DIR}/solv")
+ add_subdirectory("${PROJECT_SOURCE_DIR}/tools")
+-add_subdirectory("${PROJECT_SOURCE_DIR}/pytests")
+-- 
+2.26.1
+
diff --git a/vars/tdnf.vars b/vars/tdnf.vars
new file mode 100644
index 00000000..d33a55ea
--- /dev/null
+++ b/vars/tdnf.vars
@@ -0,0 +1,22 @@
+#
+# set +o errexit -o noglob -o nounset is assumed.
+#
+
+pkg_tdnf_configure() {
+	if ! rtl_fileop rm config.cache						\
+	|| ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX=""	\
+		cmake	-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"			\
+			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"		\
+			-DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++"	\
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY"		\
+			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY"		\
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER"		\
+			-DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}"			\
+			-DCMAKE_INSTALL_PREFIX=""				\
+			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"		\
+			"../tdnf-${PKG_VERSION}"; then
+		return 1;
+	fi;
+};
+
+# vim:filetype=sh textwidth=0