Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Feb 2022 00:56:54 +0000
From:      bugzilla-noreply@freebsd.org
To:        ports-bugs@FreeBSD.org
Subject:   [Bug 259178] sysutils/s6-rc meta-update for the skarnet suite
Message-ID:  <bug-259178-7788-vAz6Jla99S@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-259178-7788@https.bugs.freebsd.org/bugzilla/>
References:  <bug-259178-7788@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259178

--- Comment #11 from dewayne@heuristicsystems.com.au ---
(In reply to crest from comment #9)
Apologies for delay due to a little COVID issue. :-/

LIVEDIR used in the Makefile was /run/s6-rc as I believe that is the docume=
nted
 "default" in s6-rc (?). But with LIVEDIR?=3D I set it elsewhere.

I've updated my suite to: skalibs 2.11.10, execline 2.8.2.0, s6 2.11.0.1, s=
6-rc
0.5.3.0 changed detailed below.
The main issue experienced: -s was removed from s6-svscan.

My effort entailed:=20
skalibs
-------
Changed Makefile's PORTVERSION
sed -i '' -e "s/2.10.0.3/2.11.1.0/g" -e
"s|libskarnet.so.2.10|libskarnet.so.2.11|1" pkg-plist

Modified pkg-plist because these files need to be removed:
devel/skalibs/work/stage/usr/local/include/skalibs/biguint.h
devel/skalibs/work/stage/usr/local/include/skalibs/cdb_make.h
devel/skalibs/work/stage/usr/local/include/skalibs/environ.h
devel/skalibs/work/stage/usr/local/include/skalibs/getpeereid.h
devel/skalibs/work/stage/usr/local/include/skalibs/iobuffer.h
devel/skalibs/work/stage/usr/local/include/skalibs/md5.h
devel/skalibs/work/stage/usr/local/include/skalibs/rc4.h
devel/skalibs/work/stage/usr/local/lib/libskarnet.so.2.10

Remember to install before building execline else you'll receive error mess=
ages
like:
src/libexecline/exlsn_define.c:13:12: error: ccexpected ';' after expression
  subgetopt localopt =3D SUBGETOPT_ZERO ;

execline
--------
Modified Makefile as follows=20
PORTVERSION=3D    2.8.2.0
BUILD_DEPENDS=3D  skalibs>=3D2.11.1.0:devel/skalibs

make makesum
sed -i '' -e "s|libexecline.so.2.7.0.0|libexecline.so.2.8.2.0|1" -e
"s|so.2.7|so.2.8|1" /usr/ports/lang/execline/pkg-plist
make package

I added the new program "case" to pkg-plist as bin/case.

s6
--
Modified Makefile
PORTVERSION=3D    2.11.0.1
BUILD_DEPENDS=3D  execline>=3D2.8.2.0:lang/execline

# make -C /usr/ports/sysutils/s6 makesum
sed -i '' -e "s|6.so.2.10.0.0|6.so.2.11.0.1|1" -e "s|6.so.2.10|6.so.2.11|1"
/usr/ports/sysutils/s6/pkg-plist

Rectified pkg-plist's s6 and s6- prefixes to correct, missing files:
sysutils/s6/work/stage/usr/local/include/s6/s6-fdholder.h
sysutils/s6/work/stage/usr/local/include/s6/s6-supervise.h
sysutils/s6/work/stage/usr/local/include/s6/s6lock.h

Added to pkg-plist
bin/s6-socklog
bin/s6-svlink
bin/s6-svunlink

Package created, installed and running.  s6-socklog works correctly which w=
as
the motivation for this effort.

s6-rc
-----
Was straight-forward as you've attached.

Hope that this is helpful. :)

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-259178-7788-vAz6Jla99S>