From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lsof: update to 4.98.0
Date: Sat, 28 Jan 2023 12:29:02 +0100 [thread overview]
Message-ID: <20230128112902.ZtFSlqio_EfLcnHb-A3iGGV3qLEEDze5o88yoewFe4E@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41909@inbox.vuxu.org>
[-- 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
}
next prev parent reply other threads:[~2023-01-28 11:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-28 11:00 [PR PATCH] " subnut
2023-01-28 11:05 ` [PR PATCH] [Updated] " subnut
2023-01-28 11:22 ` subnut
2023-01-28 11:29 ` subnut [this message]
2023-01-28 11:38 ` subnut
2023-01-28 14:33 ` subnut
2023-01-28 14:40 ` subnut
2023-01-28 14:42 ` subnut
2023-02-06 14:37 ` vincele
2023-02-07 8:31 ` [PR REVIEW] " classabbyamp
2023-02-07 9:37 ` vincele
2023-02-07 13:24 ` subnut
2023-02-07 16:26 ` classabbyamp
2023-02-07 16:36 ` [PR PATCH] [Updated] " subnut
2023-02-07 16:37 ` [PR REVIEW] " subnut
2023-05-09 1:53 ` github-actions
2023-05-10 14:03 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230128112902.ZtFSlqio_EfLcnHb-A3iGGV3qLEEDze5o88yoewFe4E@z \
--to=subnut@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).