Re: svn commit: r522711 - in head/sysutils: . samdruckerclientshell samdruckerclientshell/files
Dan Langille
dan at langille.org
Sun Jan 12 15:16:58 UTC 2020
n Sun, Jan 12, 2020, at 1:48 AM, Adam Weinberger wrote:
> On Sat, Jan 11, 2020 at 2:20 PM Dan Langille <dvl at freebsd.org> wrote:
> >
> > Author: dvl
> > Date: Sat Jan 11 21:20:13 2020
> > New Revision: 522711
> > URL: https://svnweb.freebsd.org/changeset/ports/522711
> >
> > Log:
> > Add the first SamDrucker client.
> >
> > SamDrucker is a collection of small components which create a centralized list
> > of all packages on all hosts.
> >
> > samdruckerclientshell is a small client shell, installed on a host, which
> > submits package information to the SamDrucker host you have already
> > configured.
> >
> > Added:
> > head/sysutils/samdruckerclientshell/
> > head/sysutils/samdruckerclientshell/Makefile (contents, props changed)
> > head/sysutils/samdruckerclientshell/distinfo (contents, props changed)
> > head/sysutils/samdruckerclientshell/files/
> > head/sysutils/samdruckerclientshell/files/999-samdrucker-client.in (contents, props changed)
> > head/sysutils/samdruckerclientshell/files/samdrucker.conf.sample.in (contents, props changed)
> > head/sysutils/samdruckerclientshell/pkg-descr (contents, props changed)
> > head/sysutils/samdruckerclientshell/pkg-plist (contents, props changed)
> > Modified:
> > head/sysutils/Makefile
> >
> > Modified: head/sysutils/Makefile
> > ==============================================================================
> > --- head/sysutils/Makefile Sat Jan 11 20:14:02 2020 (r522710)
> > +++ head/sysutils/Makefile Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -1172,6 +1172,7 @@
> > SUBDIR += safe-rm
> > SUBDIR += safecat
> > SUBDIR += safecopy
> > + SUBDIR += samdruckerclientshell
> > SUBDIR += samefile
> > SUBDIR += samesame
> > SUBDIR += sample
> >
> > Added: head/sysutils/samdruckerclientshell/Makefile
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/Makefile Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,34 @@
> > +# $FreeBSD$
> > +
> > +PORTNAME= SamDruckerClientShell
> > +PORTVERSION= 0.0.1
> > +CATEGORIES= sysutils
> > +MASTER_SITES= GH
> > +
> > +MAINTAINER= dan at langille.org
> > +COMMENT= Client for sending package information to SamDrucker
> > +
> > +LICENSE= BSD2CLAUSE
> > +LICENSE_FILE= LICENSE
> > +
> > +USE_GITHUB= yes
> > +GH_ACCOUNT= dlangille
> > +GH_PROJECT= SamDrucker
> > +
> > +NO_BUILD= YES
> > +
> > +SUB_FILES= 999-samdrucker-client samdrucker.conf.sample
> > +
> > +RUN_DEPENDS+= curl>0:ftp/curl
> > +RUN_DEPENDS+= jo>0:textproc/jo
> > +
> > +.include <bsd.port.pre.mk>
> > +
> > +do-install:
> > + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
> > + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/samdrucker
> > + ${INSTALL_SCRIPT} ${WRKSRC}/clients/samdrucker.sh ${STAGEDIR}${PREFIX}/bin
> > + ${INSTALL_SCRIPT} ${WRKDIR}/999-samdrucker-client ${STAGEDIR}${PREFIX}/etc/periodic/daily
> > + ${INSTALL_DATA} ${WRKDIR}/samdrucker.conf.sample ${STAGEDIR}${PREFIX}/etc/samdrucker
> > +
> > +.include <bsd.port.post.mk>
> >
> > Added: head/sysutils/samdruckerclientshell/distinfo
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/distinfo Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,3 @@
> > +TIMESTAMP = 1578775942
> > +SHA256 (dlangille-SamDrucker-0.0.1_GH0.tar.gz) = 1d75bfebd8f446ad9c75823a5de87895e713033bdee95efe20538bbf927875ed
> > +SIZE (dlangille-SamDrucker-0.0.1_GH0.tar.gz) = 6107
> >
> > Added: head/sysutils/samdruckerclientshell/files/999-samdrucker-client.in
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/files/999-samdrucker-client.in Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,25 @@
> > +#!/bin/sh -
> > +#
> > +# $FreeBSD$
> > +#
> > +
> > +if [ -r /etc/defaults/periodic.conf ]; then
> > + . /etc/defaults/periodic.conf
> > + source_periodic_confs
> > +fi
> > +
> > +rc=0
> > +
> > +case "${samdrucker_client_enable:-YES}" in
> > +[Yy][Ee][Ss])
> > + anticongestion
> > + if ! %%PREFIX%%/bin/samdrucker.sh ; then
> > + echo 'ouch, something went wrong with /usr/local/bin/samdrucker.sh'
> > + rc=2
> > + fi
> > + ;;
> > +*)
> > + ;;
> > +esac
> > +
> > +exit $rc
> >
> > Added: head/sysutils/samdruckerclientshell/files/samdrucker.conf.sample.in
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/files/samdrucker.conf.sample.in Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,2 @@
> > +SAMDRUCKER_URL="https://samdrucker.example.org/samdrucker.php"
> > +SAMDRUCKER_ARG="packages"
> >
> > Added: head/sysutils/samdruckerclientshell/pkg-descr
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/pkg-descr Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,15 @@
> > +Sample client for SamDrucker, which will store lists of packages installed on
> > +hosts.
> > +
> > +SamDrucker is a collection of small components which create a centralized list
> > +of all packages on all hosts.
> > +
> > +Each component is designed to be:
> > +
> > +* small
> > +* simple
> > +* easily written
> > +* flexiable
> > +* few, if any, dependencies
> > +
> > +WWW: https://github.com/dlangille/SamDrucker
> >
> > Added: head/sysutils/samdruckerclientshell/pkg-plist
> > ==============================================================================
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/sysutils/samdruckerclientshell/pkg-plist Sat Jan 11 21:20:13 2020 (r522711)
> > @@ -0,0 +1,6 @@
> > +bin/samdrucker.sh
> > +etc/periodic/daily/999-samdrucker-client
> > + at sample etc/samdrucker/samdrucker.conf.sample
> > +
> > + at dir etc/periodic/daily
> > + at dir etc/samdrucker
>
> Hi Dan,
>
> The shell script hardcodes /usr/local in a number of places, but a
> post-patch sed can fix it up.
There were two places:
* etc/periodic/daily/999-samdrucker-client
* bin/samdrucker.sh
The periodic script I patched in the port.
For the .sh script I applied a local patch.
However, I like the sed idea better though. It would continue to
work regardless of any upstream changes. I will do that soon.
Thank you
More information about the svn-ports-all
mailing list