[PR PATCH] lsof: upgrade to 4.99.0

[PR PATCH] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1345 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 5b60f83d103926d39ab7e224bd14ea38667145c7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 16 +++--
 2 files changed, 12 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..afce56eb7fbdc 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,9 +1,13 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
+configure_args="
+ --enable-security
+ --disable-static
+ --disable-shared
+"
 hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
@@ -12,11 +16,11 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
 	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
 		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
 	fi
 
@@ -26,4 +30,8 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: lsof: upgrade to 4.99.0

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1808930514

Comment:
Please explain how did you test if it doesn't build.

Re: lsof: upgrade to 4.99.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1808953259

Comment:
the fail is caused by a patch that is only applied in CI, which seems like something that should not be done

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809119315

Comment:
Ah shit.... sorry.

Will submit the fix tomorrow.... 

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From a390407694e4496f06dafc4bd5c950cbb53aa239 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    |  2 +-
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 19 +++--
 3 files changed, 15 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
index 05582cf654927..034d2c00252ea 100644
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -2,7 +2,7 @@ gethostbyaddr() fails on the hostname of GitHub CI containers
 
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
+@@ -###,6 +###,3 @@
 -    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
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..11ffe6a551da6 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,9 +1,13 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
+configure_args="
+ --enable-security
+ --disable-static
+ --disable-shared
+"
 hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
@@ -12,12 +16,13 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
 	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		lnum="$(sed -n '/if (gethostname(hnm, sizeof(hnm) - 1)) {/=' tests/LTsock.c)"
+		sed "/^@@.*@@$/s/###/$lnum/g" "$FILESDIR/fix-github-ci.patch" | patch -Np1
 	fi
 
 	# Ensure tests always run
@@ -26,4 +31,8 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391734558

Comment:
templates should not be modifying files outside of the build dir. it would be better to just rm this test in CI

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From af49160db247486260c77e49b16bf63aaa0c5e48 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 +++-
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 16 +++--
 3 files changed, 21 insertions(+), 93 deletions(-)
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
index 05582cf654927..45db9edb83483 100644
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,12 +1,18 @@
 gethostbyaddr() fails on the hostname of GitHub CI containers
 
+diff --git a/tests/LTsock.c b/tests/LTsock.c
+index 7c582e1..307b61f 100644
 --- a/tests/LTsock.c
 +++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
+@@ -242,10 +242,7 @@
+      * 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;
+-        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))) {
+         // fallback to localhost if hostname cannot be resolved
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..afce56eb7fbdc 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,9 +1,13 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
+configure_args="
+ --enable-security
+ --disable-static
+ --disable-shared
+"
 hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
@@ -12,11 +16,11 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
 	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
 		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
 	fi
 
@@ -26,4 +30,8 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809181615

Comment:
one specific test case of a single test suite fails on github containers, simply because `gethostname()` isn't able to get the hostname of the github container that the test is running on.

This causes the _whole_ test to fail.

This problem isn't encountered on normal Void installations (as per my experience)

Since this test fails only on GitHub CI, I use a workaround only on GitHub's CI.

>  a patch that is only applied in CI, which seems like something that should not be done

So... what should I do?  
Should I completely disable tests in CI?

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809181615

Comment:
one specific test case of a single test suite fails on github containers, simply because `gethostname()` isn't able to get the hostname of the github container that the test is running on.

This causes the _whole_ test to fail.

This problem isn't encountered on normal Void installations (as per my experience)

Since this test fails only on GitHub CI, I use a workaround only on GitHub's CI.

>  a patch that is only applied in CI, which seems like something that should not be done

So... what should I do?  
Should I completely disable tests in CI?

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391744268

Comment:
Sorry, that was a completely stupid and overcomplicated attempt at solving the problem..

... the patch itself was outdated.

I just updated it.

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391744746

Comment:
Sorry for having to witness this abomination of a code .... (i should probably go to sleep now lol)

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809119315

Comment:
Ah shit.... sorry.

~~Will submit the fix tomorrow....~~

Welp... i fixed it. (goodnight!)

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391956349

Comment:
rm this file

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391955220

Comment:
```suggestion
	# hostname/IP resolution fails in CI container
```

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391954816

Comment:
```suggestion
pre_check() {
```

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391955406

Comment:
```suggestion
		ln -sf /bin/true tests/LTsock
```

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391954482

Comment:
```suggestion
configure_args="--enable-security --disable-static --disable-shared"
```

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1391956213

Comment:
is this necessary with the `--disable-*` flags in configure_args?

Re: lsof: upgrade to 4.99.0

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809509795

Comment:
i think there's not much point in trying to brute-force that test to work, so just disable it in CI

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392299984

Comment:
Yes. Even after adding `--disable-static`, for some reason it still installs `/usr/lib/liblsof.a`

And I don't know anything about `configure` files in order to debug the error.

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From cf706b7e0943101dee027aac4c663d129d45875a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 18 +++--
 3 files changed, 11 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..0188f12695d97 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,9 +1,9 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
+configure_args="--enable-security --disable-static --disable-shared"
 hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
@@ -12,12 +12,12 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
-post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+pre_check() {
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		ln -sf /bin/true tests/LTsock
 	fi
 
 	# Ensure tests always run
@@ -26,4 +26,8 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392308238

Comment:
See latest commit. This doesn't seem to work...

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 26cd3a1b079b3ebbb31ecf9df943a2a49a6f4862 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 22 ++++--
 3 files changed, 16 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..052544e9f4978 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,9 +1,9 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
+configure_args="--enable-security --disable-static --disable-shared"
 hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
@@ -12,12 +12,18 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		cp tests/Makefile tests/Makefile.orig
+	fi
+}
+
+pre_check() {
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		sed '/^STDTST=/s/LTsock//g' tests/Makefile.orig > tests/Makefile
 	fi
 
 	# Ensure tests always run
@@ -26,4 +32,8 @@ post_extract() {
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392325384

Comment:
That's because the `LTsock` executable created by the Makefile replaces the symlink we created.

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809905340

Comment:
Oops... forgot to stage the changes.

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1809905340

Comment:
Oops... forgot to stage the changes.

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 0e95ca0472c2f48268b1b58b111ebc331675517d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 20 ++++--
 3 files changed, 13 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..370533a8bd112 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
-hostmakedepends=groff
+configure_args="--enable-security --disable-static --disable-shared"
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,18 +12,24 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s|tests/LTsock||g'
 	fi
+}
 
+pre_check() {
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
 }
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392342203

Comment:
I've implemented an alternative solution by changing `Makefile.am`

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From a2f10a1472d61a4d376ae34ec4259f03d797cb01 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

According to the changelog, liblsof is still in alpha stage.
So, we are not going to package it for now.
---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 20 ++++--
 3 files changed, 13 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..370533a8bd112 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
-configure_args="--enable-security"
-hostmakedepends=groff
+configure_args="--enable-security --disable-static --disable-shared"
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,18 +12,24 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s|tests/LTsock||g'
 	fi
+}
 
+pre_check() {
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
 }
 
 post_install() {
 	vlicense COPYING
+
+	# liblsof is still in alpha
+	rm -r "${DESTDIR}/usr/lib"
+	rm -r "${DESTDIR}/usr/include"
 }

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 41be09696fcec0655980b5372f612f72b0197b7f Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 17 +++--
 3 files changed, 11 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..5d51dd62bd500 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-security"
-hostmakedepends=groff
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,14 +12,19 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s:tests/LTsock::g'
 	fi
 
+	# liblsof is still in alpha. Don't include it in the package.
+	vsed -i Makefile.am -e '/^lib_LTLIBRARIES/d; /^include_HEADERS/d'
+}
+
+pre_check() {
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392413930

Comment:
Fixed it by changing Makefile.am

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From cb8814d38bc34ed766685f33490265d7f36d5169 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 17 +++--
 3 files changed, 11 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..d02c052c1cabd 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-security"
-hostmakedepends=groff
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,14 +12,19 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s:tests/LTsock::g'
 	fi
 
+	# liblsof is still in alpha. Don't include it in the package.
+	vsed -i Makefile.am -e '/^lib_LTLIBRARIES/s/^lib_/noinst_/; /^include_HEADERS/d'
+}
+
+pre_check() {
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
 }

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 919ec2cbc8a8b999dd3bb6c2a984c631a40b5fe4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 17 +++--
 3 files changed, 11 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..d02c052c1cabd 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-security"
-hostmakedepends=groff
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,14 +12,19 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s:tests/LTsock::g'
 	fi
 
+	# liblsof is still in alpha. Don't include it in the package.
+	vsed -i Makefile.am -e '/^lib_LTLIBRARIES/s/^lib_/noinst_/; /^include_HEADERS/d'
+}
+
+pre_check() {
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
 }

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392421196

Comment:
Outdated....?

Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1350 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/47214

lsof: upgrade to 4.99.0
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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/47214.patch is attached

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

From 0cd2ae36676fde40f7b581199c6e89b76280f501 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 14 Nov 2023 01:06:46 +0530
Subject: [PATCH] lsof: upgrade to 4.99.0

---
 srcpkgs/lsof/files/fix-github-ci.patch    | 12 ----
 srcpkgs/lsof/patches/fix-epoll-test.patch | 86 -----------------------
 srcpkgs/lsof/template                     | 20 +++---
 3 files changed, 12 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/lsof/files/fix-github-ci.patch
 delete mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch

diff --git a/srcpkgs/lsof/files/fix-github-ci.patch b/srcpkgs/lsof/files/fix-github-ci.patch
deleted file mode 100644
index 05582cf654927..0000000000000
--- a/srcpkgs/lsof/files/fix-github-ci.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gethostbyaddr() fails on the hostname of GitHub CI containers
-
---- a/tests/LTsock.c
-+++ b/tests/LTsock.c
-@@ -262,6 +262,3 @@
--    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))) {
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
deleted file mode 100644
index 64087d99173d3..0000000000000
--- a/srcpkgs/lsof/patches/fix-epoll-test.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 21a623dad947c..4d6260e11c566 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,10 +1,10 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.98.0
+version=4.99.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-security"
-hostmakedepends=groff
+hostmakedepends="automake groff"
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
@@ -12,16 +12,20 @@ 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/releases/download/${version}/lsof-${version}.tar.gz"
-checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
+checksum=180e6284aff184d94d273e34f7264edc2af849c07b1c5d6a4183d4d402734245
 
 post_extract() {
-	# Fix GitHub CI quirks
-	if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
-		patch -Np1 <"$FILESDIR/fix-github-ci.patch"
-	fi
-
 	# Ensure tests always run
 	ln -sf /bin/true tests/CkTestDB
+
+	# Skip tests/LTsock on GitHub CI
+	# hostname/IP resolution fails in CI container
+	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+		vsed -i Makefile.am -e '/^TESTS +=/s:tests/LTsock::g'
+	fi
+
+	# liblsof is still in alpha. Don't include it in the package.
+	vsed -i Makefile.am -e '/^lib_LTLIBRARIES/s/^lib_/noinst_/; /^include_HEADERS/d'
 }
 
 post_install() {

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392421196

Comment:
Outdated....?

Re: [PR REVIEW] lsof: upgrade to 4.99.0

[subnut]

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

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#discussion_r1392543093

Comment:
....outdated?

Re: lsof: upgrade to 4.99.0

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/47214#issuecomment-1810151105

Comment:
@classabbyamp Done.

Re: [PR PATCH] [Merged]: lsof: upgrade to 4.99.0

[Duncaen]

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

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

lsof: upgrade to 4.99.0
https://github.com/void-linux/void-packages/pull/47214

Description:
According to the changelog, liblsof is still in alpha stage. So, we are not going to package it for now.

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

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

<!--
#### 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
-->