[PR PATCH] rpm: update to 4.16.0.

[PR PATCH] rpm: update to 4.16.0.

[glaulher]

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

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

https://github.com/glaulher/void-packages rpm
https://github.com/void-linux/void-packages/pull/26612

rpm: update to 4.16.0.


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

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

From 1f70b5bdca9473ec70979ce6efde370852d9fb1f Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 22 Nov 2020 18:50:13 -0300
Subject: [PATCH] rpm: update to 4.16.0.

---
 srcpkgs/rpm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index d39c3746781..ad99758ac14 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,21 +1,21 @@
 # Template file for 'rpm'
 pkgname=rpm
-version=4.15.1
-revision=4
+version=4.16.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-lua --with-cap --with-acl --with-external-db
  --enable-python PYTHON=python3 --sharedstatedir=/var/lib"
 hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
  python3-setuptools"
-makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
+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"
 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.15.x/rpm-${version}.tar.bz2"
-checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2"
+checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
 python_version=2 #unverified
 conflicts="rpmextract>=0" # Both provide rpm2cpio
 

Re: [PR REVIEW] rpm: update to 4.16.0.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#discussion_r528412628

Comment:
`rpm-${version%.*}.x` could work?

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-731855890

Comment:
Please fix the `xlint` error as well, and I think the musl build is missing `#include <fcntl.h>` from the `rpmdb.c` file.

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-731855890

Comment:
Please fix the `xlint` error as well, and I think the musl build is missing `#include <fcntl.h>` in the `rpmdb.c` file.

Re: [PR PATCH] [Closed]: rpm: update to 4.16.0.

[glaulher]

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

There's a closed pull request on the void-packages repository

rpm: update to 4.16.0.
https://github.com/void-linux/void-packages/pull/26612

Description:

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-731927251

Comment:
I accidentally deleted the branch I was testing on, and I can't reset the pr, the xlint fix, how can I include the #include <fcntl.h> in the rpmdb.c file?

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-731943030

Comment:
You will probably need to open a new PR.

- For xlint, check the python version is indeed correct and remove the comment
- For fcntl, create a patch that adds the `#include <fcntl.h>` line to the include block in the file; I can try and get you a patch to do that.

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732142983

Comment:
yesterday I can fix the xlint it's ok now, but I can't solve the question of the path

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732146605

Comment:

yesterday trying to put the lines in the patch I don't know if it's correct, but it continued with an error:

---rpmdb.c
+++rpmdb.c 
@@ -1,7 +1,9 @@
#include "system.h"

+#include <fcntl.h>
+#include <sys/stat.h>
#include <popt.h>
#include <rpm/rpmcli.h>
#include <rpm/rpmdb.h>
#include "cliutils.h"
#include "debug.h"

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732147363

Comment:
Can you show the error messages this time? Remember you have to clean the build `./xbps-src clean rpm` for the patch to be applied.

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732164844

Comment:
=> rpm-4.16.0_1: verifying checksum for distfile 'rpm-4.16.0.tar.bz2'... OK.
=> rpm-4.16.0_1: running do-extract hook: 00-distfiles ...
=> rpm-4.16.0_1: extracting distfile(s), please wait...
=> rpm-4.16.0_1: running do-patch hook: 00-patches ...
=> rpm-4.16.0_1: patching: fix-musl-rpmdb.patch.
=> ERROR: rpm-4.16.0_1: do-patch_00-patches: 'patch -sl ${_args} -i ${_patch} 2> /dev/null' exited with 2
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732168235

Comment:
Take a look at the other patch, you might be missing part of the path... It has:

```
--- rpmio/digest_nss.c
+++ rpmio/digest_nss.c
```

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732173192

Comment:
unfortunately I don't know how to go about correcting the error. help-me 

Re: rpm: update to 4.16.0.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732173527

Comment:
Open a new PR with your current attempt, I can help you better from there.

Re: rpm: update to 4.16.0.

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26612#issuecomment-732175283

Comment:
ok, thanks

Re: rpm: update to 4.16.0

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-748540700

Comment:
thank you.

Re: rpm: update to 4.16.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-747658699

Comment:
Você ainda tinha dois commits (pode ver aqui https://github.com/void-linux/void-packages/pull/26642/commits ).  Eu juntei os dois e aproveitei para atualizar para 4.16.1.2.

Re: rpm: update to 4.16.0

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-733710834

Comment:
> Cada vez mais fundo!
> 
> Tente fazer isso a partir da raiz do seu clone, enquanto você está no `rpm`branch:
> 
> ```
> git fetch --all --prune
> cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
> git reset --hard upstream/master
> mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
> mv template srcpkgs/rpm/
> git add srcpkgs/rpm
> git commit -m 'rpm: update to 4.16.0.'
> git push -f
> ```


thanks for your help and ericonr's help, 
I think it's ok now.

Re: rpm: update to 4.16.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-733237474

Comment:
Deeper and deeper!

Try this from the root of your clone, while you are in the `rpm` branch:
```
git fetch --all --prune
cp srcpkgs/rpm/{template,patches/fix-musl-rpmdb.patch} .
git reset --hard upstream/master
mv fix-musl-rpmdb.patch srcpkgs/rpm/patches/
mv template srcpkgs/rpm/
git add srcpkgs/rpm
git commit -m 'rpm: update to 4.16.0.'
git push -f
```

Re: rpm: update to 4.16.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732401680

Comment:
`git rebase upstream/master` should do it

Re: rpm: update to 4.16.0

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732394046

Comment:
for some reason trying to rebase I pushed the push up incorrectly, how do I fix it?

Re: rpm: update to 4.16.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732316358

Comment:
Your local repository might have been out of date, which would have made it build the outdated dependencies. Do `git remote add upstream https://github.com/void-linux/void-packages.git` then `git pull upstream master --autostash`

Re: rpm: update to 4.16.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732316358

Comment:
Your local repository might have been out of date, which would have made it build the outdated dependencies. Do `git remote add upstream https://github.com/void-linux/void-packages.git` then `git pull upstream master --autostash`

Re: rpm: update to 4.16.0

[glaulher]

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

New comment by glaulher on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732311707

Comment:

the package compiled in musl but took 2h6m46s

Re: rpm: update to 4.16.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732218883

Comment:
The patch you made is patching the wrong file, you need to apply

```diff
diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
index e1e48b3b0d..2c0317ee5a 100644
--- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
+++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch
@@ -1,12 +1,11 @@
---- rpmdb.c
-+++ rpmdb.c
-@@ -1,7 +1,9 @@
-#include "system.h"
-
+--- lib/rpmdb.c
++++ lib/rpmdb.c
+@@ -8,6 +8,8 @@
+ #include <utime.h>
+ #include <errno.h>
+ #include <dirent.h>
++#include <sys/stat.h>
 +#include <fcntl.h>
-+#include <sys / stat.h>
-#include <popt.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include "cliutils.h"
-#include "debug.h"
+ 
+ #ifndef	DYING	/* XXX already in "system.h" */
+ #include <fnmatch.h>
```

to your repository instead.

The final patch should look like

```
--- lib/rpmdb.c
+++ lib/rpmdb.c
@@ -8,6 +8,8 @@
 #include <utime.h>
 #include <errno.h>
 #include <dirent.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #ifndef	DYING	/* XXX already in "system.h" */
 #include <fnmatch.h>
```

Also, rebase your branch so the merge commit goes away.