Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lsof: update to 4.95.0, fix manpage
@ 2022-04-28 16:36 subnut
  2022-04-28 18:20 ` [PR PATCH] [Updated] " subnut
                   ` (47 more replies)
  0 siblings, 48 replies; 49+ messages in thread
From: subnut @ 2022-04-28 16:36 UTC (permalink / raw)
  To: ml

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

lsof: update to 4.95.0, fix manpage
<!-- 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: 3247 bytes --]

From eabf8eac18058dfb362f24b562a3a031ab12b506 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 manpage

---
 srcpkgs/lsof/patches/Lsof.8.patch | 25 +++++++++++++++++++++++++
 srcpkgs/lsof/template             | 28 ++++++++++++++++++++++------
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/lsof/patches/Lsof.8.patch

diff --git a/srcpkgs/lsof/patches/Lsof.8.patch b/srcpkgs/lsof/patches/Lsof.8.patch
new file mode 100644
index 000000000000..463f21168947
--- /dev/null
+++ b/srcpkgs/lsof/patches/Lsof.8.patch
@@ -0,0 +1,25 @@
+diff --git a/Lsof.8.orig b/Lsof.8
+index 76bf0fa3..e82e837b 100644
+--- a/Lsof.8.orig
++++ 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/template b/srcpkgs/lsof/template
index 2c13c23beed4..5ba8662c56d5 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,6 +1,6 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.94.0
+version=4.95.0
 revision=1
 build_style=configure
 configure_script="./Configure"
@@ -9,9 +9,9 @@ hostmakedepends="perl which"
 short_desc="LiSt Open Files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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"
+distfiles="https://github.com/lsof-org/lsof/archive/${version}.tar.gz"
+checksum=8ff4c77736cc7d9556da9e2c7614cc4292a12f1979f20bd520d3c6f64b66a4d7
 
 pre_configure() {
 	export LSOF_CC="$CC"
@@ -19,7 +19,7 @@ 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
 }
 
@@ -38,9 +38,25 @@ post_check() {
 	mv ./hosts /etc/hosts
 }
 
+post_build() {
+	{	# .so only works if the file being included exists in the
+		# current directory or a subdirectory of it. So, we should
+		# include the files directly into the manpage instead of
+		# referencing them using .so
+		while read -r LINE; do
+			if [ "$LINE" != ".so${LINE#.so}" ]; then
+				printf '%s\n' "$LINE"	# echo causes problems
+				continue
+			fi
+			LINE="${LINE#.so}"
+			cat "${LINE## }"
+		done
+	} <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

^ permalink raw reply	[flat|nested] 49+ messages in thread

end of thread, other threads:[~2022-05-21 21:05 UTC | newest]

Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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

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).