From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lsof: upgrade to 4.99.0
Date: Tue, 14 Nov 2023 12:03:53 +0100 [thread overview]
Message-ID: <20231114110353._yELSKK3L0_S7zzUrH7I8P1PlfdrZ0GKDb4P90_r4s0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47214@inbox.vuxu.org>
[-- 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"
}
next prev parent reply other threads:[~2023-11-14 11:03 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 19:40 [PR PATCH] " subnut
2023-11-13 19:49 ` Chocimier
2023-11-13 19:57 ` classabbyamp
2023-11-13 21:04 ` subnut
2023-11-13 21:35 ` [PR PATCH] [Updated] " subnut
2023-11-13 21:39 ` [PR REVIEW] " classabbyamp
2023-11-13 21:47 ` [PR PATCH] [Updated] " subnut
2023-11-13 21:47 ` subnut
2023-11-13 21:50 ` subnut
2023-11-13 21:51 ` [PR REVIEW] " subnut
2023-11-13 21:52 ` subnut
2023-11-13 21:53 ` subnut
2023-11-14 3:59 ` [PR REVIEW] " classabbyamp
2023-11-14 3:59 ` classabbyamp
2023-11-14 3:59 ` classabbyamp
2023-11-14 3:59 ` classabbyamp
2023-11-14 3:59 ` classabbyamp
2023-11-14 3:59 ` classabbyamp
2023-11-14 4:00 ` classabbyamp
2023-11-14 9:48 ` [PR REVIEW] " subnut
2023-11-14 9:52 ` [PR PATCH] [Updated] " subnut
2023-11-14 9:54 ` [PR REVIEW] " subnut
2023-11-14 10:04 ` [PR PATCH] [Updated] " subnut
2023-11-14 10:05 ` [PR REVIEW] " subnut
2023-11-14 10:07 ` subnut
2023-11-14 10:08 ` subnut
2023-11-14 10:17 ` [PR PATCH] [Updated] " subnut
2023-11-14 10:17 ` [PR REVIEW] " subnut
2023-11-14 11:03 ` subnut [this message]
2023-11-14 11:04 ` [PR PATCH] [Updated] " subnut
2023-11-14 11:05 ` [PR REVIEW] " subnut
2023-11-14 11:09 ` [PR PATCH] [Updated] " subnut
2023-11-14 11:09 ` subnut
2023-11-14 11:11 ` [PR REVIEW] " subnut
2023-11-14 11:14 ` [PR PATCH] [Updated] " subnut
2023-11-14 11:18 ` [PR REVIEW] " subnut
2023-11-14 12:53 ` subnut
2023-11-14 12:54 ` subnut
2023-12-03 20:02 ` [PR PATCH] [Merged]: " Duncaen
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=20231114110353._yELSKK3L0_S7zzUrH7I8P1PlfdrZ0GKDb4P90_r4s0@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).