[PR PATCH] lsof: update to 4.98.0

[PR PATCH] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From 8d951c4c47bbe15ecd80deac773d7affe013107a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 82 +++++++++++++++++++++++
 srcpkgs/lsof/patches/fix-tests.patch      | 16 -----
 srcpkgs/lsof/template                     | 46 +++----------
 3 files changed, 93 insertions(+), 51 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-tests.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..6c00a6141236
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,82 @@
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
deleted file mode 100644
index bd9fa284d19a..000000000000
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch eliminates the need to modify /etc/hosts
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
--    if (gethostname(hnm, sizeof(hnm) - 1)) {
--	cem = "ERROR!!!  can't get this host's name";
--	goto print_errno;
--    }
-+    strncpy(hnm, "localhost", sizeof(hnm) - 1);
-     hnm[sizeof(hnm) - 1] = '\0';
-     if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..2eec5def58c2 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,24 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
-
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
-}
-
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_install() {
+	vlicense COPYING
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From 3abc01bde5f32d35b78d83eaba921e9430c5343b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 82 +++++++++++++++++++++++
 srcpkgs/lsof/patches/fix-tests.patch      | 16 -----
 srcpkgs/lsof/template                     | 46 ++++---------
 3 files changed, 95 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-tests.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..6c00a6141236
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,82 @@
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
deleted file mode 100644
index bd9fa284d19a..000000000000
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch eliminates the need to modify /etc/hosts
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
--    if (gethostname(hnm, sizeof(hnm) - 1)) {
--	cem = "ERROR!!!  can't get this host's name";
--	goto print_errno;
--    }
-+    strncpy(hnm, "localhost", sizeof(hnm) - 1);
-     hnm[sizeof(hnm) - 1] = '\0';
-     if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..a36c21f0a2a4 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,28 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
-
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+post_install() {
+	vlicense COPYING
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_check() {
+	cat ./test-suite.log
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From ce04ce3b7022836cfac7ffb1e804621dff17e8de Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 82 +++++++++++++++++++++++
 srcpkgs/lsof/patches/fix-tests.patch      | 16 -----
 srcpkgs/lsof/template                     | 50 +++++---------
 3 files changed, 99 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-tests.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..6c00a6141236
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,82 @@
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
deleted file mode 100644
index bd9fa284d19a..000000000000
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch eliminates the need to modify /etc/hosts
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
--    if (gethostname(hnm, sizeof(hnm) - 1)) {
--	cem = "ERROR!!!  can't get this host's name";
--	goto print_errno;
--    }
-+    strncpy(hnm, "localhost", sizeof(hnm) - 1);
-     hnm[sizeof(hnm) - 1] = '\0';
-     if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..23c210f9ec6f 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,32 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
-
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+post_install() {
+	vlicense COPYING
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+do_check() {
+	make check; EC=$?
+	if [ $EC -ne 0 ]; then
+		cat ./test-suite.log
+	fi
+	return $EC
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From a5d2e29392a5defb493824b4454257db53d03420 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 82 +++++++++++++++++++++++
 srcpkgs/lsof/patches/fix-tests.patch      | 16 -----
 srcpkgs/lsof/template                     | 51 +++++---------
 3 files changed, 100 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-tests.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..6c00a6141236
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,82 @@
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
deleted file mode 100644
index bd9fa284d19a..000000000000
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch eliminates the need to modify /etc/hosts
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
--    if (gethostname(hnm, sizeof(hnm) - 1)) {
--	cem = "ERROR!!!  can't get this host's name";
--	goto print_errno;
--    }
-+    strncpy(hnm, "localhost", sizeof(hnm) - 1);
-     hnm[sizeof(hnm) - 1] = '\0';
-     if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..724dfcd0e146 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,33 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
-
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+post_install() {
+	vlicense COPYING
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+do_check() {
+	make check; EC=$?
+	echo ============================================================================
+	echo ./test-suite.log
+	echo ============================================================================
+	cat ./test-suite.log
+	return $EC
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From 2ad610af73145d2d04ccb8747ed1b1bdb1fc243b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 82 +++++++++++++++++++++++
 srcpkgs/lsof/patches/fix-tests.patch      | 16 -----
 srcpkgs/lsof/template                     | 50 +++++---------
 3 files changed, 99 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-tests.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..6c00a6141236
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,82 @@
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
deleted file mode 100644
index bd9fa284d19a..000000000000
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch eliminates the need to modify /etc/hosts
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
--    if (gethostname(hnm, sizeof(hnm) - 1)) {
--	cem = "ERROR!!!  can't get this host's name";
--	goto print_errno;
--    }
-+    strncpy(hnm, "localhost", sizeof(hnm) - 1);
-     hnm[sizeof(hnm) - 1] = '\0';
-     if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..39e70f228b84 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,32 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
-
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+post_install() {
+	vlicense COPYING
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+do_check() {
+	make check || {
+		EC=$?
+		cat ./test-suite.log
+		return $EC
+	}
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From e260dcb75e3d3d8aa164781fc16704036c20b196 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 .../fix-github-ci.patch}                      |  2 +-
 srcpkgs/lsof/patches/fix-epoll-test.patch     | 85 +++++++++++++++++++
 srcpkgs/lsof/template                         | 49 ++++-------
 3 files changed, 101 insertions(+), 35 deletions(-)
 rename srcpkgs/lsof/{patches/fix-tests.patch => files/fix-github-ci.patch} (88%)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/files/fix-github-ci.patch
similarity index 88%
rename from srcpkgs/lsof/patches/fix-tests.patch
rename to srcpkgs/lsof/files/fix-github-ci.patch
index bd9fa284d19a..0c3b5410fc2c 100644
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,4 +1,4 @@
-This patch eliminates the need to modify /etc/hosts
+gethostbyaddr() fails on the hostname of GitHub CI containers
 
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..5ea7225119f0
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,85 @@
+This patch has been upstreamed already, and should be
+unnecessary in the next release.
+
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..21a623dad947 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,29 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
-}
-
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
+	# Fix GitHub CI quirks
+	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	fi
 
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_install() {
+	vlicense COPYING
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From c720b178979cca866b4e90310095b613be74e842 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 .../fix-github-ci.patch}                      |  7 +-
 srcpkgs/lsof/patches/fix-epoll-test.patch     | 85 +++++++++++++++++++
 srcpkgs/lsof/template                         | 49 ++++-------
 3 files changed, 102 insertions(+), 39 deletions(-)
 rename srcpkgs/lsof/{patches/fix-tests.patch => files/fix-github-ci.patch} (66%)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/files/fix-github-ci.patch
similarity index 66%
rename from srcpkgs/lsof/patches/fix-tests.patch
rename to srcpkgs/lsof/files/fix-github-ci.patch
index bd9fa284d19a..3d52a6207e20 100644
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,11 +1,8 @@
-This patch eliminates the need to modify /etc/hosts
+gethostbyaddr() fails on the hostname of GitHub CI containers
 
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
+@@ -262,7 +262,4 @@
 -    if (gethostname(hnm, sizeof(hnm) - 1)) {
 -	cem = "ERROR!!!  can't get this host's name";
 -	goto print_errno;
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..5ea7225119f0
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,85 @@
+This patch has been upstreamed already, and should be
+unnecessary in the next release.
+
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..21a623dad947 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,29 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
-}
-
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
+	# Fix GitHub CI quirks
+	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	fi
 
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_install() {
+	vlicense COPYING
 }

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From 9e8a101778d7dec07f691add9449741f6141f654 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 .../fix-github-ci.patch}                      |  8 +-
 srcpkgs/lsof/patches/fix-epoll-test.patch     | 85 +++++++++++++++++++
 srcpkgs/lsof/template                         | 49 ++++-------
 3 files changed, 102 insertions(+), 40 deletions(-)
 rename srcpkgs/lsof/{patches/fix-tests.patch => files/fix-github-ci.patch} (51%)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/files/fix-github-ci.patch
similarity index 51%
rename from srcpkgs/lsof/patches/fix-tests.patch
rename to srcpkgs/lsof/files/fix-github-ci.patch
index bd9fa284d19a..05582cf65492 100644
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,11 +1,8 @@
-This patch eliminates the need to modify /etc/hosts
+gethostbyaddr() fails on the hostname of GitHub CI containers
 
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
+@@ -262,6 +262,3 @@
 -    if (gethostname(hnm, sizeof(hnm) - 1)) {
 -	cem = "ERROR!!!  can't get this host's name";
 -	goto print_errno;
@@ -13,4 +10,3 @@ This patch eliminates the need to modify /etc/hosts
 +    strncpy(hnm, "localhost", sizeof(hnm) - 1);
      hnm[sizeof(hnm) - 1] = '\0';
      if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..5ea7225119f0
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,85 @@
+This patch has been upstreamed already, and should be
+unnecessary in the next release.
+
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..21a623dad947 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,29 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
-}
-
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
+	# Fix GitHub CI quirks
+	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	fi
 
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_install() {
+	vlicense COPYING
 }

Re: lsof: update to 4.98.0

[vincele]

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

New comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#issuecomment-1419185524

Comment:
Briefly tested on x86_64-musl, LGTM

Re: [PR REVIEW] lsof: update to 4.98.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#discussion_r1098332196

Comment:
add a link to it please

Re: [PR REVIEW] lsof: update to 4.98.0

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#discussion_r1098411163

Comment:
I think this is it:
https://github.com/void-linux/void-packages/pull/41909/files#diff-122915c48ac80e5e28054e63f87f41571facf87faf46b0700d0d9fa9bb1dc9c7

Re: [PR REVIEW] lsof: update to 4.98.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#discussion_r1098655412

Comment:
@classabbyamp Here -
https://github.com/lsof-org/lsof/commit/5ca335ff9ae6510cba0a94a62fbaa46709f7cb16

Do I need to mention it in the patch?

Re: [PR REVIEW] lsof: update to 4.98.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#discussion_r1098899112

Comment:
yes please

Re: [PR PATCH] [Updated] lsof: update to 4.98.0

[subnut]

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

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

https://github.com/subnut/void-packages lsof
https://github.com/void-linux/void-packages/pull/41909

lsof: update to 4.98.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- 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/41909.patch is attached

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

From 121213890070ef860f37d3d4a38d048af1f7357a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH] lsof: update to 4.98.0

---
 .../fix-github-ci.patch}                      |  8 +-
 srcpkgs/lsof/patches/fix-epoll-test.patch     | 86 +++++++++++++++++++
 srcpkgs/lsof/template                         | 49 ++++-------
 3 files changed, 103 insertions(+), 40 deletions(-)
 rename srcpkgs/lsof/{patches/fix-tests.patch => files/fix-github-ci.patch} (51%)
 create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/files/fix-github-ci.patch
similarity index 51%
rename from srcpkgs/lsof/patches/fix-tests.patch
rename to srcpkgs/lsof/files/fix-github-ci.patch
index bd9fa284d19a..05582cf65492 100644
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,11 +1,8 @@
-This patch eliminates the need to modify /etc/hosts
+gethostbyaddr() fails on the hostname of GitHub CI containers
 
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
-  * Get the host name and its IP address.  Convert the IP address to dotted
-  * ASCII form.
-  */
+@@ -262,6 +262,3 @@
 -    if (gethostname(hnm, sizeof(hnm) - 1)) {
 -	cem = "ERROR!!!  can't get this host's name";
 -	goto print_errno;
@@ -13,4 +10,3 @@ This patch eliminates the need to modify /etc/hosts
 +    strncpy(hnm, "localhost", sizeof(hnm) - 1);
      hnm[sizeof(hnm) - 1] = '\0';
      if (!(hp = gethostbyname(hnm))) {
-        (void) snprintf(buf, bufl - 1, "ERROR!!!  can't get IP address for %s",
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..64087d99173d
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,86 @@
+This patch has been upstreamed already, and should be
+unnecessary in the next release.
+
+https://github.com/lsof-org/lsof/commit/5ca335ff9ae6510cba0a94a62fbaa46709f7cb16
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+ 
+ $TARGET 2>> $report | {
+-    read pid epfd
+-    if [[ -z "$pid" || -z "$epfd" ]]; then
+-	echo "unexpected output form target ( $TARGET )" >> $report
++    read pid epfd evp0 evp1
++    if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++	echo "unexpected output from target ( $TARGET )" >> $report
+ 	exit 1
+     fi
+     if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ 	echo done
+     } >> $report
+     if $lsof -p $pid -a -d $epfd |
+-	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++	    grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ 	kill $pid
+ 	exit 0
+     else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+       return 1;
+     }
+ 
+-  struct epoll_event ev;
+-  int fd[2];
+-  if (pipe(fd) < 0)
+-  if (fd < 0)
++  int pipefd[2];
++  if (pipe(pipefd) < 0)
+     {
+       perror ("pipe");
+       return 1;
+     }
+-  if (dup2(fd[0], 5) < 0)
++  int evfd[2];
++  if ((evfd[0] = dup(pipefd[0])) < 0)
+     {
+-      perror ("dup2(fd[0], 5)");
++      perror ("dup(pipefd[0])");
+       return 1;
+     }
+-  if (dup2(fd[1], 6) < 0)
++  if ((evfd[1] = dup(pipefd[1])) < 0)
+     {
+-      perror ("dup2(fd[1], 6)");
++      perror ("dup(pipefd[1])");
+       return 1;
+     }
+ 
++  struct epoll_event ev;
+   ev.events = EPOLLOUT;
+-  ev.data.fd = 6;
++  ev.data.fd = evfd[1];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<6>");
++      perror ("epoll_ctl<evfd[1]>");
+       return 1;
+     }
+ 
+   ev.events = EPOLLIN;
+-  ev.data.fd = 5;
++  ev.data.fd = evfd[0];
+   if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+     {
+-      perror ("epoll_ctl<5>");
++      perror ("epoll_ctl<evfd[0]>");
+       return 1;
+     }
+ 
+-  printf ("%d %d\n", getpid(), epfd);
++  printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+   fflush (stdout);
+   pause ();
+   return 0;
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..21a623dad947 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,29 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.96.3
+version=4.98.0
 revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="custom:lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
 
 post_extract() {
-	# See: https://github.com/lsof-org/lsof/issues/61
-	# The TestDB was meant for storing known-good configurations, and
-	# skipping tests if the current system configuration exists in the
-	# TestDB.   But we don't want that.
-	rm tests/CkTestDB
-	ln -s /bin/true tests/CkTestDB
-}
-
-pre_configure() {
-	export LSOF_CC="$CC"
-	export LSOF_CFGF="$CFLAGS"
-	export LSOF_CFGL="$LDFLAGS"
-	export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
-	export LSOF_MAKE="$(command -v make)"
+	# Fix GitHub CI quirks
+	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	fi
 
-	vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		-i dialects/linux/machine.h
-
-	soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+	# Ensure tests always run
+	ln -sf /bin/true tests/CkTestDB
 }
 
-do_install() {
-	vbin lsof
-	vman lsof.8
-
-	# extract license from readme
-	sed -n 00README -e '/^License/,/\*\/$/p' > License
-	vlicense License
+post_install() {
+	vlicense COPYING
 }

Re: [PR REVIEW] lsof: update to 4.98.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#discussion_r1098912704

Comment:
@classabbyamp Done.

Re: lsof: update to 4.98.0

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41909#issuecomment-1539278322

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Merged]: lsof: update to 4.98.0

[leahneukirchen]

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

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

lsof: update to 4.98.0
https://github.com/void-linux/void-packages/pull/41909

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->