diff options
| author | schmonz <schmonz@pkgsrc.org> | 2020-01-25 11:17:31 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2020-01-25 11:17:31 +0000 |
| commit | 5e0d80fe67352dda8a99d0204761887277775247 (patch) | |
| tree | 4801b55333e2d9c116e9b37b1083b29395712492 | |
| parent | 0a1e4b683695e14c1c5959910edd7b77ec243bc0 (diff) | |
| download | pkgsrc-5e0d80fe67352dda8a99d0204761887277775247.tar.gz | |
In ls(1) output from tests, omit any trailing SELinux dot. Fixes
self-tests on CentOS. Bump PKGREVISION.
| -rw-r--r-- | sysutils/daemontools-encore/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/daemontools-encore/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/daemontools-encore/patches/patch-rts.tests_supervise-lock.sh | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile index 2bad6c495a6..d4f90b9ad7e 100644 --- a/sysutils/daemontools-encore/Makefile +++ b/sysutils/daemontools-encore/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2020/01/23 16:49:59 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2020/01/25 11:17:31 schmonz Exp $ DISTNAME= daemontools-encore-1.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${HOMEPAGE} diff --git a/sysutils/daemontools-encore/distinfo b/sysutils/daemontools-encore/distinfo index d7e9241d1e4..10aff70a35d 100644 --- a/sysutils/daemontools-encore/distinfo +++ b/sysutils/daemontools-encore/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2020/01/23 16:49:59 schmonz Exp $ +$NetBSD: distinfo,v 1.3 2020/01/25 11:17:31 schmonz Exp $ SHA1 (daemontools-encore-1.11.tar.gz) = 23f8dc5cf2d063c481b328fce523fc8a0349b693 RMD160 (daemontools-encore-1.11.tar.gz) = 518f85f1502bf969ee60d5169642089752bd2d52 @@ -7,4 +7,5 @@ Size (daemontools-encore-1.11.tar.gz) = 94917 bytes SHA1 (patch-MAN) = 7c361a3365a43a992d7a0ccf938b79dc2a8691bc SHA1 (patch-Makefile) = b1bc2500071491280a02f158bf4d8ed4e0aa369e SHA1 (patch-rts.tests_supervise-downtime.sh) = c6415e1c0adce32e5ad57ad5457fd1be98c53958 +SHA1 (patch-rts.tests_supervise-lock.sh) = 1f2e036adb93a0f872ae2a3f2d7fd89ea0a9809a SHA1 (patch-sleeper.c) = cdae9837bb8a5cc268c8e86e97e03d11f8e9d32d diff --git a/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-lock.sh b/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-lock.sh new file mode 100644 index 00000000000..3f6fb7a2cbb --- /dev/null +++ b/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-lock.sh @@ -0,0 +1,18 @@ +$NetBSD: patch-rts.tests_supervise-lock.sh,v 1.1 2020/01/25 11:17:31 schmonz Exp $ + +In ls(1) output from tests, omit any trailing SELinux dot. + +--- rts.tests/supervise-lock.sh.orig 2018-10-14 00:48:50.000000000 +0000 ++++ rts.tests/supervise-lock.sh +@@ -1,9 +1,9 @@ + echo '--- supervise leaves locked service intact' + supervise test.sv & + waitok test.sv +-( cd test.sv/supervise && ls -dl * | awk '{ print $1, $5, $9 }' ) ++( cd test.sv/supervise && ls -dl * | awk '{ print substr($1,1,10), $5, $9 }' ) + supervise test.sv; echo $? +-( cd test.sv/supervise && ls -dl * | awk '{ print $1, $5, $9 }' ) ++( cd test.sv/supervise && ls -dl * | awk '{ print substr($1,1,10), $5, $9 }' ) + svc -x test.sv; echo $? + wait + svstat test.sv; echo $? |