diff --git a/build/lsof/build.sh b/build/lsof/build.sh index 25637bda5..ada32bc67 100755 --- 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 new file mode 100644 index 000000000..e3fec706d --- /dev/null +++ b/build/lsof/files/ctf.ignore @@ -0,0 +1 @@ +ptti.c diff --git a/build/lsof/local.mog b/build/lsof/local.mog index cd6dccd1f..a6f76f36f 100644 --- 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 - emit \ - link path=$(OPREFIX)/%<1>/%<2> target=../$(PROG)/%<1>/%<2> > - -# Symlink man pages - 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 set mode 2555> set group sys> -license files/licence license=lsof + + diff --git a/build/lsof/patches/genunix.patch b/build/lsof/patches/genunix.patch deleted file mode 100644 index a3d578af0..000000000 --- a/build/lsof/patches/genunix.patch +++ /dev/null @@ -1,21 +0,0 @@ - -As of "14768: retire nca", the sockfs module no longer contains CTF data for -the types that lsof needs. However, these are present in genunix and apparently -always have been (at least back to r151038) so we can safely patch lsof to read -those instead. - -The patch doesn't adjust the 32-bit kernel line since it would be changing -one non-existent path (/kernel/fs/sockfs) to another. - -diff -wpruN '--exclude=*.orig' a~/dialects/sun/dnode.c a/dialects/sun/dnode.c ---- a~/dialects/sun/dnode.c 1970-01-01 00:00:00 -+++ a/dialects/sun/dnode.c 1970-01-01 00:00:00 -@@ -88,7 +88,7 @@ static int Sockfs_ctfs = 0; /* CTF initi - * sockfs */ - - # if defined(_LP64) --#define SOCKFS_MOD_FORMAT "/kernel/fs/%s/sockfs" -+#define SOCKFS_MOD_FORMAT "/kernel/%s/genunix" - # else /* !defined(_LP64) */ - #define SOCKFS_MOD_FORMAT "/kernel/fs/sockfs" - # endif /* defined(_LP64) */ diff --git a/build/lsof/patches/include_limits.patch b/build/lsof/patches/include_limits.patch deleted file mode 100644 index b671f60ab..000000000 --- a/build/lsof/patches/include_limits.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wpruN '--exclude=*.orig' a~/arg.c a/arg.c ---- a~/arg.c 1970-01-01 00:00:00 -+++ a/arg.c 1970-01-01 00:00:00 -@@ -29,6 +29,8 @@ - * 4. This notice may not be removed or altered. - */ - -+#include /* For *_MAX. */ -+ - #ifndef lint - static char copyright[] = - "@(#) Copyright 1994 Purdue Research Foundation.\nAll rights reserved.\n"; diff --git a/build/lsof/patches/series b/build/lsof/patches/series deleted file mode 100644 index df3bb4755..000000000 --- a/build/lsof/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -include_limits.patch -genunix.patch diff --git a/build/ripgrep/build.sh b/build/ripgrep/build.sh index 842f9ced8..c08fc2468 100755 --- 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 index be385dd24..960949527 100644 --- 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)