From dfb2b82dc9d6d3c452af66172fec77ff437eaa71 Mon Sep 17 00:00:00 2001 From: K M J 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 +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