Bug 219544
| Summary: | net/pacemaker: Update to 1.1.16 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | David Shane Holden <dpejesh> | ||||||
| Component: | Individual Port(s) | Assignee: | Jochen Neumeister <joneum> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Some People | CC: | joneum, tz | ||||||
| Priority: | --- | Keywords: | needs-patch, needs-qa | ||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Bug Depends on: | 219542 | ||||||||
| Bug Blocks: | |||||||||
| Attachments: |
|
||||||||
Hi, the patch doesn't work: ===> Staging rc.d startup script(s) =========================================================================== ====> Running Q/A tests (stage-qa) Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/pengine/regression.sh' Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/coverage.sh' Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/BasicSanity.sh' Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/cts/lxc_autogen.sh' Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/cts/cts' Error: '/usr/bin/python' is an invalid shebang you need USES=shebangfix for 'share/pacemaker/tests/cts/CTSlab.py' *** Error code 1 Stop. make: stopped in /usr/ports/net/pacemaker ====>> Error: stage-qa failures detected see: http://joneumbox.org/data/12amd64-ports/2017-05-28_14h05m24s/logs/errors/pacemaker-1.1.16.log Created attachment 183010 [details]
pacemaker-1.1.16.patch
Hi,
can you please fix this too?
/net/pacemaker % portlint -AC
WARN: Makefile: [51]: possible direct use of command "sh" found. use ${SH} instead.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
FATAL: Makefile: DISTVERSIONPREFIX appears out-of-order.
FATAL: Makefile: order must be PORTNAME/PORTVERSION/DISTVERSIONPREFIX/DISTVERSION/DISTVERSIONSUFFIX/PORTREVISION/PORTEPOCH/CATEGORIES/MASTER_SITES/MASTER_SITE_SUBDIR/PROJECTHOST/PKGNAMEPREFIX/PKGNAMESUFFIX/DISTNAME/EXTRACT_SUFX/DISTFILES/DIST_SUBDIR/EXTRACT_ONLY.
WARN: Makefile: new ports should not set PORTREVISION.
WARN: Makefile: "LIB_DEPENDS" has to appear earlier.
WARN: Makefile: "BUILD_DEPENDS" has to appear earlier.
WARN: Makefile: "RUN_DEPENDS" has to appear earlier.
FATAL: /usr/home/joneum/dev/ports/net/pacemaker/distinfo: has no SIZE record for ClusterLabs-pacemaker-Pacemaker-1.1.14_GH0.tar.gz.
FATAL: /usr/home/joneum/dev/ports/net/pacemaker/distinfo: no checksum record for ClusterLabs-pacemaker-Pacemaker-1.1.14_GH0.tar.gz.
WARN: /usr/home/joneum/dev/ports/net/pacemaker/distinfo: no checksum records for all supported algorithms (SHA256) for ClusterLabs-pacemaker-Pacemaker-1.1.14_GH0.tar.gz.
4 fatal errors and 7 warnings found.
When I run portlint the only warnings I get are about the use of sh and the $FreeBSD$ tag. Your output shows portlint erring about not being able to find 1.1.14 in distinfo but that should have been patched out. I just wanted to follow up on this because I'm not sure if you're waiting on me for anything. Your portlint output leads me to believe your ports tree got into a weird state and the patch didn't apply cleanly. I just tested it against the latest svn checkout and below is the output.
$ svn patch ~/pacemaker-1.1.16.patch ; portlint -AC
U Makefile
U distinfo
D files/patch-Makefile.common
U files/patch-crmd_pengine.c
D files/patch-crmd_throttle.c
D files/patch-extra_resources_ping
D files/patch-lib-common-utils.c
D files/patch-lib-services-services_linux.c
A files/patch-lrmd_Makefile.am
A files/patch-mcp_Makefile.am
U pkg-plist
WARN: Makefile: [51]: possible direct use of command "sh" found. use ${SH} instead.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 3 warnings found.
David, your patch is fine for portlint. I checked it! A commit references this bug: Author: joneum Date: Tue Jun 13 14:32:23 UTC 2017 New revision: 443502 URL: https://svnweb.freebsd.org/changeset/ports/443502 Log: - net/pacemaker: Update from 1.1.14 to 1.1.16 - Fix shebangs - Changelog: https://github.com/ClusterLabs/pacemaker/blob/master/ChangeLog PR: 219544 Submitted by: David Shane Holden (maintainer) Approved by: miwi (mentor) Differential Revision: https://reviews.freebsd.org/D11109 Changes: head/net/pacemaker/Makefile head/net/pacemaker/distinfo head/net/pacemaker/files/patch-Makefile.common head/net/pacemaker/files/patch-crmd_pengine.c head/net/pacemaker/files/patch-crmd_throttle.c head/net/pacemaker/files/patch-extra_resources_ping head/net/pacemaker/files/patch-lib-common-utils.c head/net/pacemaker/files/patch-lib-services-services_linux.c head/net/pacemaker/files/patch-lrmd_Makefile.am head/net/pacemaker/files/patch-mcp_Makefile.am head/net/pacemaker/pkg-plist Committed, thanks :-) |
Created attachment 182899 [details] pacemaker-1.1.16.patch