* Re: [PR REVIEW] rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
@ 2020-11-22 22:12 ` ericonr
2020-11-22 22:15 ` ericonr
` (12 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-22 22:12 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
2020-11-22 22:12 ` [PR REVIEW] " ericonr
@ 2020-11-22 22:15 ` ericonr
2020-11-22 22:15 ` ericonr
` (11 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-22 22:15 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
2020-11-22 22:12 ` [PR REVIEW] " ericonr
2020-11-22 22:15 ` ericonr
@ 2020-11-22 22:15 ` ericonr
2020-11-23 4:22 ` [PR PATCH] [Closed]: " glaulher
` (10 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-22 22:15 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Closed]: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (2 preceding siblings ...)
2020-11-22 22:15 ` ericonr
@ 2020-11-23 4:22 ` glaulher
2020-11-23 5:02 ` glaulher
` (9 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 4:22 UTC (permalink / raw)
To: ml
[-- 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:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (3 preceding siblings ...)
2020-11-23 4:22 ` [PR PATCH] [Closed]: " glaulher
@ 2020-11-23 5:02 ` glaulher
2020-11-23 5:53 ` ericonr
` (8 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 5:02 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (4 preceding siblings ...)
2020-11-23 5:02 ` glaulher
@ 2020-11-23 5:53 ` ericonr
2020-11-23 12:52 ` glaulher
` (7 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 5:53 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (5 preceding siblings ...)
2020-11-23 5:53 ` ericonr
@ 2020-11-23 12:52 ` glaulher
2020-11-23 13:00 ` glaulher
` (6 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 12:52 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (6 preceding siblings ...)
2020-11-23 12:52 ` glaulher
@ 2020-11-23 13:00 ` glaulher
2020-11-23 13:01 ` ericonr
` (5 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 13:00 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (7 preceding siblings ...)
2020-11-23 13:00 ` glaulher
@ 2020-11-23 13:01 ` ericonr
2020-11-23 13:33 ` glaulher
` (4 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 13:01 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (8 preceding siblings ...)
2020-11-23 13:01 ` ericonr
@ 2020-11-23 13:33 ` glaulher
2020-11-23 13:40 ` ericonr
` (3 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 13:33 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (9 preceding siblings ...)
2020-11-23 13:33 ` glaulher
@ 2020-11-23 13:40 ` ericonr
2020-11-23 13:49 ` glaulher
` (2 subsequent siblings)
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 13:40 UTC (permalink / raw)
To: ml
[-- 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
```
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (10 preceding siblings ...)
2020-11-23 13:40 ` ericonr
@ 2020-11-23 13:49 ` glaulher
2020-11-23 13:49 ` ericonr
2020-11-23 13:52 ` glaulher
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 13:49 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (11 preceding siblings ...)
2020-11-23 13:49 ` glaulher
@ 2020-11-23 13:49 ` ericonr
2020-11-23 13:52 ` glaulher
13 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 13:49 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0.
2020-11-22 21:54 [PR PATCH] rpm: update to 4.16.0 glaulher
` (12 preceding siblings ...)
2020-11-23 13:49 ` ericonr
@ 2020-11-23 13:52 ` glaulher
13 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 13:52 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
@ 2020-11-23 15:05 ` ericonr
2020-11-23 17:32 ` glaulher
` (8 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 15:05 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
2020-11-23 15:05 ` ericonr
@ 2020-11-23 17:32 ` glaulher
2020-11-23 17:40 ` ericonr
` (7 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 17:32 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
2020-11-23 15:05 ` ericonr
2020-11-23 17:32 ` glaulher
@ 2020-11-23 17:40 ` ericonr
2020-11-23 17:40 ` ericonr
` (6 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 17:40 UTC (permalink / raw)
To: ml
[-- 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`
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (2 preceding siblings ...)
2020-11-23 17:40 ` ericonr
@ 2020-11-23 17:40 ` ericonr
2020-11-23 20:01 ` glaulher
` (5 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 17:40 UTC (permalink / raw)
To: ml
[-- 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`
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (3 preceding siblings ...)
2020-11-23 17:40 ` ericonr
@ 2020-11-23 20:01 ` glaulher
2020-11-23 20:15 ` ericonr
` (4 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-23 20:01 UTC (permalink / raw)
To: ml
[-- 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?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (4 preceding siblings ...)
2020-11-23 20:01 ` glaulher
@ 2020-11-23 20:15 ` ericonr
2020-11-24 21:14 ` ahesford
` (3 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-11-23 20:15 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (5 preceding siblings ...)
2020-11-23 20:15 ` ericonr
@ 2020-11-24 21:14 ` ahesford
2020-11-25 13:37 ` glaulher
` (2 subsequent siblings)
9 siblings, 0 replies; 25+ messages in thread
From: ahesford @ 2020-11-24 21:14 UTC (permalink / raw)
To: ml
[-- 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
```
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (6 preceding siblings ...)
2020-11-24 21:14 ` ahesford
@ 2020-11-25 13:37 ` glaulher
2020-12-17 19:42 ` ericonr
2020-12-19 23:46 ` glaulher
9 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-11-25 13:37 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (7 preceding siblings ...)
2020-11-25 13:37 ` glaulher
@ 2020-12-17 19:42 ` ericonr
2020-12-19 23:46 ` glaulher
9 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-12-17 19:42 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: rpm: update to 4.16.0
2020-11-23 14:36 [PR PATCH] " glaulher
` (8 preceding siblings ...)
2020-12-17 19:42 ` ericonr
@ 2020-12-19 23:46 ` glaulher
9 siblings, 0 replies; 25+ messages in thread
From: glaulher @ 2020-12-19 23:46 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 25+ messages in thread