[PR PATCH] [PATCH] Fix rmlint bug #438.

[PR PATCH] [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

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

https://github.com/Sarkasper/void-packages rmlint
https://github.com/void-linux/void-packages/pull/26697

[PATCH] Fix rmlint bug #438.
https://github.com/sahib/rmlint/issues/438
https://github.com/sahib/rmlint/pull/444

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

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

From 7f2d6d2ff9e328704516e4d9332bb75c9d3c60ef Mon Sep 17 00:00:00 2001
From: K M J <Sarkasper@users.noreply.github.com>
Date: Fri, 13 Nov 2020 15:24:42 +0100
Subject: [PATCH] [PATCH] Fix rmlint bug #438.

---
 srcpkgs/rmlint/patches/444.patch | 23 +++++++++++++++++++++++
 srcpkgs/rmlint/template          |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rmlint/patches/444.patch

diff --git a/srcpkgs/rmlint/patches/444.patch b/srcpkgs/rmlint/patches/444.patch
new file mode 100644
index 00000000000..1937ae2ca24
--- /dev/null
+++ b/srcpkgs/rmlint/patches/444.patch
@@ -0,0 +1,23 @@
+From fc26e889e42602d96226514b65c33c06c47ecd99 Mon Sep 17 00:00:00 2001
+From: Chris Baker <ChrisBaker97@users.noreply.github.com>
+Date: Thu, 12 Nov 2020 13:54:17 -0500
+Subject: [PATCH] cfg.c: fix bug introduced in 2.10.0
+
+This reversion back to the code from version `2.9.0` addresses #438. Obviously there is some functionality here that's being implemented that I'm not familiar enough with the project to understand, but hopefully this gives someone a head start in trying to track down the bug, while still keeping the intended new behavior.
+---
+ lib/cfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/cfg.c b/lib/cfg.c
+index 92b02136..e46756e2 100644
+--- a/lib/cfg.c
++++ b/lib/cfg.c
+@@ -109,7 +109,7 @@ guint rm_cfg_add_path(RmCfg *cfg, bool is_prefd, const char *path) {
+     int rc = 0;
+ 
+ #if HAVE_FACCESSAT
+-    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS|AT_SYMLINK_NOFOLLOW);
++    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS);
+ #else
+     rc = access(path, R_OK);
+ #endif
diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index b77f20b805a..c3761749e80 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
 version=2.10.1
-revision=2
+revision=3
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"
@@ -12,6 +12,7 @@ homepage="http://rmlint.rtfd.org/"
 changelog="https://raw.githubusercontent.com/sahib/rmlint/master/CHANGELOG.md"
 distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz"
 checksum=10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883
+patch_args="-Np1"
 
 do_install() {
 	scons install --prefix=${DESTDIR}/usr

Re: [PR PATCH] [Updated] [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

There is an updated pull request by Sarkasper against master on the void-packages repository

https://github.com/Sarkasper/void-packages rmlint
https://github.com/void-linux/void-packages/pull/26697

[PATCH] Fix rmlint bug #438.
https://github.com/sahib/rmlint/issues/438
https://github.com/sahib/rmlint/pull/444

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

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

From dfb2b82dc9d6d3c452af66172fec77ff437eaa71 Mon Sep 17 00:00:00 2001
From: K M J <Sarkasper@users.noreply.github.com>
Date: Fri, 13 Nov 2020 15:24:42 +0100
Subject: [PATCH] [PATCH] Fix rmlint bug #438.

---
 srcpkgs/rmlint/patches/444.patch | 23 +++++++++++++++++++++++
 srcpkgs/rmlint/template          |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rmlint/patches/444.patch

diff --git a/srcpkgs/rmlint/patches/444.patch b/srcpkgs/rmlint/patches/444.patch
new file mode 100644
index 00000000000..1937ae2ca24
--- /dev/null
+++ b/srcpkgs/rmlint/patches/444.patch
@@ -0,0 +1,23 @@
+From fc26e889e42602d96226514b65c33c06c47ecd99 Mon Sep 17 00:00:00 2001
+From: Chris Baker <ChrisBaker97@users.noreply.github.com>
+Date: Thu, 12 Nov 2020 13:54:17 -0500
+Subject: [PATCH] cfg.c: fix bug introduced in 2.10.0
+
+This reversion back to the code from version `2.9.0` addresses #438. Obviously there is some functionality here that's being implemented that I'm not familiar enough with the project to understand, but hopefully this gives someone a head start in trying to track down the bug, while still keeping the intended new behavior.
+---
+ lib/cfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/cfg.c b/lib/cfg.c
+index 92b02136..e46756e2 100644
+--- a/lib/cfg.c
++++ b/lib/cfg.c
+@@ -109,7 +109,7 @@ guint rm_cfg_add_path(RmCfg *cfg, bool is_prefd, const char *path) {
+     int rc = 0;
+ 
+ #if HAVE_FACCESSAT
+-    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS|AT_SYMLINK_NOFOLLOW);
++    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS);
+ #else
+     rc = access(path, R_OK);
+ #endif
diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index b77f20b805a..c4ffb0bdb9f 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
 version=2.10.1
-revision=2
+revision=4
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"
@@ -12,6 +12,7 @@ homepage="http://rmlint.rtfd.org/"
 changelog="https://raw.githubusercontent.com/sahib/rmlint/master/CHANGELOG.md"
 distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz"
 checksum=10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883
+patch_args="-Np1"
 
 do_install() {
 	scons install --prefix=${DESTDIR}/usr

Re: [PR REVIEW] [PATCH] Fix rmlint bug #438.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#discussion_r530446220

Comment:
Just remove the prefix from the patch: `a/lib/cfg.c -> lib/cfg.c`, then this isn't necessary.

Re: [PR REVIEW] [PATCH] Fix rmlint bug #438.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#discussion_r530445690

Comment:
3

Re: [PR REVIEW] [PATCH] Fix rmlint bug #438.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#discussion_r530445575

Comment:
I'd wait for upstream to bless the patch, `AT_SYMLINK_NOFOLLOW` is very specific behavior.

Re: [PATCH] Fix rmlint bug #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733766572

Comment:
Also, please follow commit message style: `rmlint: backport bug fix` or something like it

Re: [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733835104

Comment:
> Also, please follow commit message style: `rmlint: backport bug fix` or something like it

Should I add something like [NOMERGE] to the commit message?

Re: [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733835104

Comment:
> Also, please follow commit message style: `rmlint: backport bug fix` or something like it

Should I add something like [NOMERGE] to the commit message until there is a upstream solution?

Re: [PATCH] Fix rmlint bug #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733836479

Comment:
No, that type of warning only goes in the PR title itself

Re: [PR REVIEW] [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

New review comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#discussion_r530528886

Comment:
Ok, thanks for giving input on the issue.

Re: [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733840307

Comment:
Also had some trouble finding an example for a correct commit message in the manual, is there somewhere else I could have found it?

What is the difference between the commit message and PR title?

Re: [PR PATCH] [Updated] [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

There is an updated pull request by Sarkasper against master on the void-packages repository

https://github.com/Sarkasper/void-packages rmlint
https://github.com/void-linux/void-packages/pull/26697

[PATCH] Fix rmlint bug #438.
https://github.com/sahib/rmlint/issues/438
https://github.com/sahib/rmlint/pull/444

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

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

From cd9bb1827702eae8db2e69774940accbbffd0347 Mon Sep 17 00:00:00 2001
From: K M J <Sarkasper@users.noreply.github.com>
Date: Fri, 13 Nov 2020 15:24:42 +0100
Subject: [PATCH] rmlint: backport bug fix.

---
 srcpkgs/rmlint/patches/444.patch | 23 +++++++++++++++++++++++
 srcpkgs/rmlint/template          |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rmlint/patches/444.patch

diff --git a/srcpkgs/rmlint/patches/444.patch b/srcpkgs/rmlint/patches/444.patch
new file mode 100644
index 00000000000..889819b3e3f
--- /dev/null
+++ b/srcpkgs/rmlint/patches/444.patch
@@ -0,0 +1,23 @@
+From fc26e889e42602d96226514b65c33c06c47ecd99 Mon Sep 17 00:00:00 2001
+From: Chris Baker <ChrisBaker97@users.noreply.github.com>
+Date: Thu, 12 Nov 2020 13:54:17 -0500
+Subject: [PATCH] cfg.c: fix bug introduced in 2.10.0
+
+This reversion back to the code from version `2.9.0` addresses #438. Obviously there is some functionality here that's being implemented that I'm not familiar enough with the project to understand, but hopefully this gives someone a head start in trying to track down the bug, while still keeping the intended new behavior.
+---
+ lib/cfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/cfg.c b/lib/cfg.c
+index 92b02136..e46756e2 100644
+--- lib/cfg.c
++++ lib/cfg.c
+@@ -109,7 +109,7 @@ guint rm_cfg_add_path(RmCfg *cfg, bool is_prefd, const char *path) {
+     int rc = 0;
+ 
+ #if HAVE_FACCESSAT
+-    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS|AT_SYMLINK_NOFOLLOW);
++    rc = faccessat(AT_FDCWD, path, R_OK, AT_EACCESS);
+ #else
+     rc = access(path, R_OK);
+ #endif
diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index b77f20b805a..52b0a13cfad 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
 version=2.10.1
-revision=2
+revision=3
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"

Re: [PATCH] Fix rmlint bug #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733840307

Comment:
Also had some trouble finding an example for a correct commit message in the manual, is there somewhere else I could have found it?

What is the difference between the commit message and PR title?
Edit: I found the edit PR title button

Re: [PATCH] Fix rmlint bug #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733842582

Comment:
Oh wow this is completely broken on musl right now... I'm strongly considering simply reverting it to the previous version.

Re. commit messages, see https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733849963

Comment:
 > Re. commit messages, see https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes

Ah I should have checked all the examples better, read "without a version change" as in excluding revision change.

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733851053

Comment:
> Oh wow this is completely broken on musl right now... I'm strongly considering simply reverting it to the previous version.

Yes I has been for quite a while, if I remember correctly downgrading didn't solve it, maybe should have tried couple versions back.

Re: [NOMERGE] rmlint: backport bugfix #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733852082

Comment:
Downgrading with a local package wouldn't be possible, only this version was built with python3.9. Building the previous one works well enough tho.

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733854791

Comment:
Cool thanks for checking!

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733854791

Comment:
Cool, thanks for checking!

Re: [NOMERGE] rmlint: backport bugfix #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-733868484

Comment:
If you want to go forward with this PR (instead of a simple revert to the previous version), I think it would be best to revert the entire https://github.com/sahib/rmlint/commit/5ca6d25905cd372e8b07ecd9696a097acb0d5742 commit

Re: [NOMERGE] rmlint: backport bugfix #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-739572890

Comment:
@Sarkasper https://github.com/sahib/rmlint/commit/a726d0cbf839d7a0f35962d67e0f60054d0364f6 is apparently the proper fix, so I'm going to make a PR for that instead. Is that ok for you?

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-739588214

Comment:
> @Sarkasper [sahib/rmlint@a726d0c](https://github.com/sahib/rmlint/commit/a726d0cbf839d7a0f35962d67e0f60054d0364f6) is apparently the proper fix, so I'm going to make a PR for that instead. Is that ok for you?

That's ok for me, thanks!

Re: [PR PATCH] [Closed]: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

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

[NOMERGE] rmlint: backport bugfix #438.
https://github.com/void-linux/void-packages/pull/26697

Description:
https://github.com/sahib/rmlint/issues/438
https://github.com/sahib/rmlint/pull/444

Re: [NOMERGE] rmlint: backport bugfix #438.

[Sarkasper]

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

New comment by Sarkasper on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-740500631

Comment:
@ericonr I'm unable to install the update, get the same error when installing from repo or local built package:
`[*] Verifying package integrity
rmlint-2.10.1_3: verifying SHA256 hash...
ERROR: rmlint-2.10.1_3: SHA256 hash is not valid: Result not representable`

Re: [NOMERGE] rmlint: backport bugfix #438.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26697#issuecomment-740674181

Comment:
@Sarkasper can you open a separate issue for this, please? I just tried it and couldn't reproduce (on x86_64, musl or glibc).