From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lsof: update to 4.95.0, fix manpage and tests, adopt
Date: Tue, 17 May 2022 07:09:45 +0200 [thread overview]
Message-ID: <20220517050945.HwmhCg3rHTRKe55dOqy6A9oOK_ityIheevVNtcicveo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36901@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1262 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/36901
lsof: update to 4.95.0, fix manpage and tests, adopt
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lsof-36901.patch --]
[-- Type: text/x-diff, Size: 4211 bytes --]
From 9f726242131087f7534cd7befb42e2745c816f2c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Thu, 28 Apr 2022 22:04:43 +0530
Subject: [PATCH] lsof: update to 4.95.0, fix man page, adopt
---
srcpkgs/lsof/patches/Lsof.8.patch | 23 ++++++++++++++++
srcpkgs/lsof/patches/fix-tests.patch | 14 ++++++++++
srcpkgs/lsof/template | 39 +++++++++++++---------------
3 files changed, 55 insertions(+), 21 deletions(-)
create mode 100644 srcpkgs/lsof/patches/Lsof.8.patch
create mode 100644 srcpkgs/lsof/patches/fix-tests.patch
diff --git a/srcpkgs/lsof/patches/Lsof.8.patch b/srcpkgs/lsof/patches/Lsof.8.patch
new file mode 100644
index 000000000000..c5af8c718763
--- /dev/null
+++ b/srcpkgs/lsof/patches/Lsof.8.patch
@@ -0,0 +1,23 @@
+--- a/Lsof.8
++++ b/Lsof.8
+@@ -1,7 +1,7 @@
+ .so ./version
+ .TH LSOF 8 Revision-\*(VN
+-\" Register )P is used neither by this file nor any groff macro. However,
+-\" some versions of nroff require it.
++.\" Register )P is used neither by this file nor any groff macro. However,
++.\" some versions of nroff require it.
+ .if !\n(.g \{\
+ . if !\n()P .nr )P 1v
+ .\}
+@@ -967,8 +967,8 @@ where:
+ .br
+ applies to all IP versions.
+ .br
+- \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP
+-.br or \fBUDPLITE\fP.
++ \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP or \fBUDPLITE\fP.
++.br
+ .br
+ \fIhostname\fP is an Internet host name. Unless a
+ .br
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch
new file mode 100644
index 000000000000..f9e595cb5463
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-tests.patch
@@ -0,0 +1,14 @@
+--- 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 2c13c23beed4..c278bd18e1b6 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,17 +1,25 @@
# Template file for 'lsof'
pkgname=lsof
-version=4.94.0
+version=4.95.0
revision=1
build_style=configure
configure_script="./Configure"
configure_args="-n linux"
-hostmakedepends="perl which"
+make_check_target="all"
+make_check_args="-C tests"
+hostmakedepends="perl which groff"
short_desc="LiSt Open Files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="custom:lsof"
-homepage="https://people.freebsd.org/~abe/"
-distfiles="https://fossies.org/linux/misc/lsof-${version}.tar.gz"
-checksum=a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4
+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}.tar.gz"
+checksum=8ff4c77736cc7d9556da9e2c7614cc4292a12f1979f20bd520d3c6f64b66a4d7
+
+post_extract() {
+ rm tests/CkTestDB
+ ln -s /bin/true tests/CkTestDB
+}
pre_configure() {
export LSOF_CC="$CC"
@@ -19,28 +27,17 @@ pre_configure() {
export LSOF_CFGL="$LDFLAGS"
export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
- vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
+ vsed -e "s|/\* \(#define\tHASSECURITY\t1\) \*/|\1|" \
-i dialects/linux/machine.h
}
-pre_check() {
- # test resolves hostname
- cp /etc/hosts ./hosts
- printf '# +++ xbps-src +++ required for lsof tests\n127.0.0.100 %s\n' "$(hostname)" >> /etc/hosts
- # write current config to test db
- cd tests && ./Add2TestDB
-}
-do_check() {
- make -C tests
-}
-post_check() {
- # cleanup polluted hosts file
- mv ./hosts /etc/hosts
+post_build() {
+ soelim Lsof.8 >lsof.8
}
do_install() {
vbin lsof
- vman Lsof.8 lsof.8
+ vman lsof.8
# extract license from readme
sed -n 00README -e '/^License/,/\*\/$/p' > License
next prev parent reply other threads:[~2022-05-17 5:09 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 16:36 [PR PATCH] lsof: update to 4.95.0, fix manpage subnut
2022-04-28 18:20 ` [PR PATCH] [Updated] " subnut
2022-05-01 15:44 ` subnut
2022-05-05 0:52 ` [PR REVIEW] " sgn
2022-05-05 1:49 ` subnut
2022-05-08 15:26 ` classabbyamp
2022-05-08 15:38 ` subnut
2022-05-08 16:08 ` [PR PATCH] [Updated] " subnut
2022-05-08 16:08 ` subnut
2022-05-08 16:09 ` subnut
2022-05-08 16:10 ` [PR REVIEW] " subnut
2022-05-08 16:27 ` [PR PATCH] [Updated] " subnut
2022-05-08 16:29 ` subnut
2022-05-08 16:34 ` subnut
2022-05-11 12:57 ` [PR PATCH] [Updated] lsof: update to 4.95.0, fix manpage and tests, adopt subnut
2022-05-13 5:03 ` subnut
2022-05-17 5:01 ` subnut
2022-05-17 5:09 ` subnut [this message]
2022-05-21 14:34 ` [PR REVIEW] " ericonr
2022-05-21 14:42 ` ericonr
2022-05-21 14:42 ` ericonr
2022-05-21 14:42 ` ericonr
2022-05-21 14:42 ` ericonr
2022-05-21 15:33 ` [PR PATCH] [Updated] " subnut
2022-05-21 15:33 ` [PR REVIEW] " subnut
2022-05-21 15:33 ` subnut
2022-05-21 15:34 ` subnut
2022-05-21 15:35 ` [PR PATCH] [Updated] " subnut
2022-05-21 15:35 ` [PR REVIEW] " subnut
2022-05-21 15:36 ` subnut
2022-05-21 15:39 ` ericonr
2022-05-21 15:41 ` ericonr
2022-05-21 15:43 ` ericonr
2022-05-21 15:43 ` [PR PATCH] [Updated] " subnut
2022-05-21 15:43 ` [PR REVIEW] " subnut
2022-05-21 16:00 ` ericonr
2022-05-21 16:09 ` [PR PATCH] [Updated] " subnut
2022-05-21 16:09 ` [PR REVIEW] " subnut
2022-05-21 16:10 ` subnut
2022-05-21 16:11 ` subnut
2022-05-21 16:11 ` [PR PATCH] [Updated] " subnut
2022-05-21 16:11 ` [PR REVIEW] " subnut
2022-05-21 16:12 ` subnut
2022-05-21 16:12 ` subnut
2022-05-21 16:26 ` [PR PATCH] [Updated] " subnut
2022-05-21 16:27 ` subnut
2022-05-21 16:28 ` subnut
2022-05-21 21:05 ` [PR PATCH] [Merged]: " ericonr
2022-05-21 21:05 ` [PR REVIEW] " ericonr
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=20220517050945.HwmhCg3rHTRKe55dOqy6A9oOK_ityIheevVNtcicveo@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).