Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [wip - needs testing] rpm: update to 4.17.0.
@ 2021-11-23 19:52 mobinmob
  0 siblings, 0 replies; only message in thread
From: mobinmob @ 2021-11-23 19:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages rpm
https://github.com/void-linux/void-packages/pull/34219

[wip - needs testing] rpm: update to 4.17.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34219.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-34219.patch --]
[-- Type: text/x-diff, Size: 4823 bytes --]

From dd975faea948ddc0017f5cfc5631b35017d915a7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 23 Nov 2021 21:48:51 +0200
Subject: [PATCH] rpm: update to 4.17.0.

---
 .../{fix-musl.patch => 0001-fix-musl.patch}   | 35 ++++++++++---------
 srcpkgs/rpm/template                          | 22 ++++++------
 2 files changed, 29 insertions(+), 28 deletions(-)
 rename srcpkgs/rpm/patches/{fix-musl.patch => 0001-fix-musl.patch} (50%)

diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/0001-fix-musl.patch
similarity index 50%
rename from srcpkgs/rpm/patches/fix-musl.patch
rename to srcpkgs/rpm/patches/0001-fix-musl.patch
index 3bf351392d84..54992195321e 100644
--- a/srcpkgs/rpm/patches/fix-musl.patch
+++ b/srcpkgs/rpm/patches/0001-fix-musl.patch
@@ -1,6 +1,18 @@
+From 22c4e45abf41b1e0dcd157bbbbcd877c2153590e Mon Sep 17 00:00:00 2001
+From: mobinmob <mobinmob@disroot.org>
+Date: Tue, 23 Nov 2021 21:10:32 +0200
+Subject: [PATCH] fix-musl
+
+# Rebased - original patch by @maxice8
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b161dc..d48c0fb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
+@@ -250,6 +250,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
  # Check for libelf library. Prefer external, otherwise none.
  WITH_LIBELF_LIB=
  AC_CHECK_HEADER([libelf.h])
@@ -8,24 +20,15 @@
  AC_CHECK_HEADERS([gelf.h], [
  	AC_CHECK_LIB(elf, gelf_getvernaux, [
  	    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-@@ -237,7 +238,7 @@ AC_CHECK_HEADERS([gelf.h], [
+@@ -258,7 +259,7 @@ AC_CHECK_HEADERS([gelf.h], [
  	])
  ])
  AC_SUBST(WITH_LIBELF_LIB)
 -AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
 +AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes])
  
- AC_CHECK_HEADERS([dwarf.h], [
-   WITH_LIBDWARF=yes
-diff --git rpmio/digest_nss.c rpmio/digest_nss.c
-index 992d9ac..5f43b57 100644
---- a/rpmio/digest_nss.c
-+++ b/rpmio/digest_nss.c
-@@ -6,6 +6,7 @@
- #include <keyhi.h>
- #include <cryptohi.h>
- #include <blapit.h>
-+#include <signal.h>
- 
- #include <rpm/rpmlog.h>
- #include "rpmio/digest.h"
+ #=================
+ # Select crypto library
+-- 
+2.34.0
+
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 2bd5ff9883e4..19bde6ba9c5a 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,30 +1,28 @@
 # Template file for 'rpm'
 pkgname=rpm
-version=4.16.1.3
-revision=2
+version=4.17.0
+revision=1
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent
-configure_args="--with-lua --with-cap --with-acl --with-external-db
+configure_args=" --with-cap --with-acl
  --enable-python PYTHON=python3 --sharedstatedir=/var/lib
  am_cv_python_version=${py3_ver}"
-hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
+hostmakedepends="automake gettext-devel libtool pkg-config
  python3-setuptools"
-makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel
- libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
+makedepends="libgcrypt-devel binutils-devel elfutils-devel file-devel libarchive-devel
+ libcap-devel lua-devel popt-devel python3-devel libgomp-devel sqlite-devel"
 short_desc="Red Hat Package Management Utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rpm.org"
 changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2"
-checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
+distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-${version}.tar.bz2"
+checksum=2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
 python_version=3
 conflicts="rpmextract>=0" # Both provide rpm2cpio
 
 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
-CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"
-CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
 
 case "$XBPS_TARGET_MACHINE" in
 	# Musl requires gettext to be included and it's cflag added otherwise
@@ -41,8 +39,8 @@ pre_configure() {
 
 librpm-devel_package() {
 	depends="librpm-${version}_${revision} librpmbuild-${version}_${revision}
-	 librpmsign-${version}_${revision} librpmio-${version}_${revision} db-devel
-	 popt-devel liblzma-devel zlib-devel bzip2-devel nss-devel lua52-devel"
+	 librpmsign-${version}_${revision} librpmio-${version}_${revision} sqlite-devel
+	 popt-devel liblzma-devel zlib-devel bzip2-devel libgcrypt-devel lua-devel"
 	short_desc+=" - development files"
 	depends="${makedepends}"
 	pkg_install() {

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-11-23 19:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-23 19:52 [PR PATCH] [wip - needs testing] rpm: update to 4.17.0 mobinmob

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).