Merge pull request #1367 from hadfl/lsof

lsof: update to 4.99.0
omniosorg · Dec 1, 2023 · 4559bf9 · 4559bf9
2 parents 9afb8a6 + 6610004
commit 4559bf9
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 73 deletions.
diff --git a/build/lsof/build.sh b/build/lsof/build.sh
@@ -12,55 +12,42 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=lsof
 PKG=ooce/file/lsof
-VER=4.95.0
-DASHREV=1
+VER=4.99.0
 SUMMARY="List open files"
 DESC="Report a list of all open files and the processes that opened them"
 
-SKIP_LICENCES=lsof
-
 OPREFIX=$PREFIX
 PREFIX+=/$PROG
 
 set_arch 64
 
+SKIP_LICENCES=lsof
+
 XFORM_ARGS="
-    -DPREFIX=${PREFIX#/}
     -DOPREFIX=${OPREFIX#/}
+    -DPREFIX=${PREFIX#/}
     -DPROG=$PROG
-    -DVERSION=$VER
-"
-
-MAKE_ARGS_WS="
-    -e
-    DEBUG=\"$CTF_CFLAGS $SSPFLAGS\"
+    -DPKGROOT=$PROG
 "
 
 pre_configure() {
-    yes | logcmd ./Configure solaris || logerr "--- Configure failed"
-    # Skip normal configure path
-    false
-}
+    typeset arch=$1
 
-make_install() {
-    logmsg "--- make install"
-    mkdir -p $DESTDIR$PREFIX/share/man/man8
-    mkdir -p $DESTDIR$PREFIX/bin
-    logcmd cp $TMPDIR/$BUILDDIR/${PROG^}.8 \
-        $DESTDIR$PREFIX/share/man/man8/$PROG.8 \
-        || logerr "--- Make install failed"
-    logcmd cp $TMPDIR/$BUILDDIR/$PROG $DESTDIR$PREFIX/bin/$PROG \
-        || logerr "--- Make install failed"
+    CONFIGURE_OPTS[$arch]+="
+        --disable-static
+        --includedir=$OPREFIX/include
+        --libdir=$OPREFIX/${LIBDIRS[$arch]}
+    "
 }
 
 init
-download_source $PROG $VER
+download_source $PROG $PROG $VER
 patch_source
 prep_build
 build

diff --git a/build/lsof/files/ctf.ignore b/build/lsof/files/ctf.ignore
@@ -0,0 +1 @@
+ptti.c
diff --git a/build/lsof/local.mog b/build/lsof/local.mog
@@ -7,20 +7,14 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
-# Symlink binaries
-<transform file link path=$(PREFIX)/(s?bin)/(.*) -> emit \
-    link path=$(OPREFIX)/%<1>/%<2> target=../$(PROG)/%<1>/%<2> >
-
-# Symlink man pages
-<transform file path=$(PREFIX)/share/man/(man\d)/(.*) -> emit \
-    link path=$(OPREFIX)/share/man/%<1>/%<2> \
-    target=../../../$(PROG)/share/man/%<1>/%<2> >
+license files/licence license=lsof
 
 # lsof needs setgid sys to read /dev/kmem
 <transform file path=$(PREFIX)/bin/$(PROG) -> set mode 2555>
 <transform file path=$(PREFIX)/bin/$(PROG) -> set group sys>
 
-license files/licence license=lsof
+<include binlink.mog>
+<include manlink.mog>
 
diff --git a/build/lsof/patches/genunix.patch b/build/lsof/patches/genunix.patch
diff --git a/build/lsof/patches/include_limits.patch b/build/lsof/patches/include_limits.patch
diff --git a/build/lsof/patches/series b/build/lsof/patches/series
diff --git a/build/ripgrep/build.sh b/build/ripgrep/build.sh
@@ -43,7 +43,7 @@ pre_package() {
     logmsg "generating man page"
     logcmd $MKDIR -p $DESTDIR$PREFIX/share/man/man1 \
         || logerr "creating man dir failed"
-    logcmd $rg --generate man \
+    logcmd -p $rg --generate man \
         >| $DESTDIR$PREFIX/share/man/man1/rg.1 \
         || logerr "generating man page failed"
 }

diff --git a/doc/packages.md b/doc/packages.md
@@ -88,7 +88,7 @@
 | ooce/editor/neovim		| 0.9.4		| https://github.com/neovim/neovim/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/emulator/qemu		| 8.1.3		| https://www.qemu.org/download/ | [omniosorg](https://github.com/omniosorg)
 | ooce/file/acltool		| 1.16.2	| https://github.com/ptrrkssn/acltool/releases | [Peter Eriksson](https://github.com/ptrrkssn)
-| ooce/file/lsof		| 4.95.0	| https://github.com/lsof-org/lsof/releases | [omniosorg](https://github.com/omniosorg)
+| ooce/file/lsof		| 4.99.0	| https://github.com/lsof-org/lsof/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/file/tree		| 2.1.1		| http://mama.indstate.edu/users/ice/tree/ | [omniosorg](https://github.com/omniosorg)
 | ooce/fonts/liberation		| 2.1.5		| https://github.com/liberationfonts/liberation-fonts/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/apr		| 1.7.4 	| https://downloads.apache.org/apr/ | [omniosorg](https://github.com/omniosorg)