svn commit: r525486 - in head/net-mgmt/resource-agents: . files
Vinícius Zavam
egypcio at FreeBSD.org
Fri Feb 7 13:36:45 UTC 2020
Author: egypcio
Date: Fri Feb 7 13:36:44 2020
New Revision: 525486
URL: https://svnweb.freebsd.org/changeset/ports/525486
Log:
net-mgmt/resource-agents: remove unnecessary use of REINPLACE_CMD
Submitted by: swills
Differential Revision: https://reviews.freebsd.org/D23566
Added:
head/net-mgmt/resource-agents/files/patch-heartbeat_IPaddr2 (contents, props changed)
head/net-mgmt/resource-agents/files/patch-heartbeat_iSCSILogicalUnit.in (contents, props changed)
Modified:
head/net-mgmt/resource-agents/Makefile
Modified: head/net-mgmt/resource-agents/Makefile
==============================================================================
--- head/net-mgmt/resource-agents/Makefile Fri Feb 7 13:33:36 2020 (r525485)
+++ head/net-mgmt/resource-agents/Makefile Fri Feb 7 13:36:44 2020 (r525486)
@@ -53,10 +53,6 @@ post-patch:
${WRKSRC}/rgmanager/src/resources/utils/config-utils.sh.in \
${WRKSRC}/rgmanager/src/resources/ASEHAagent.sh.in
-post-configure:
- ${REINPLACE_CMD} 's|md5sum|md5|g' \
- ${WRKSRC}/heartbeat/iSCSILogicalUnit
-
post-install:
${RM} ${STAGEDIR}/${LOCALBASE}/resource-agents.conf
Added: head/net-mgmt/resource-agents/files/patch-heartbeat_IPaddr2
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/resource-agents/files/patch-heartbeat_IPaddr2 Fri Feb 7 13:36:44 2020 (r525486)
@@ -0,0 +1,11 @@
+--- heartbeat/IPaddr2.orig 2020-02-07 12:39:35 UTC
++++ heartbeat/IPaddr2
+@@ -555,7 +555,7 @@ ip_init() {
+ # 5. Make sure the first octet is odd,
+ # so the result is a multicast MAC
+ IF_MAC=`echo $OCF_RESKEY_ip $NETMASK $BRDCAST | \
+- md5sum | \
++ md5 | \
+ sed -e 's#\(............\).*#\1#' \
+ -e 's#..#&:#g; s#:$##' \
+ -e 's#^\(.\)[02468aAcCeE]#\11#'`
Added: head/net-mgmt/resource-agents/files/patch-heartbeat_iSCSILogicalUnit.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/resource-agents/files/patch-heartbeat_iSCSILogicalUnit.in Fri Feb 7 13:36:44 2020 (r525486)
@@ -0,0 +1,11 @@
+--- heartbeat/iSCSILogicalUnit.in.orig 2020-02-07 12:35:45 UTC
++++ heartbeat/iSCSILogicalUnit.in
+@@ -56,7 +56,7 @@ OCF_RESKEY_scsi_id_default="${OCF_RESOURCE_INSTANCE:0:
+ : ${OCF_RESKEY_scsi_id=${OCF_RESKEY_scsi_id_default}}
+ # To have a reasonably unique default SCSI SN, use the first 8 bytes
+ # of an MD5 hash of of $OCF_RESOURCE_INSTANCE
+-sn=`echo -n "${OCF_RESOURCE_INSTANCE}" | md5sum | sed -e 's/ .*//'`
++sn=`echo -n "${OCF_RESOURCE_INSTANCE}" | md5 | sed -e 's/ .*//'`
+ OCF_RESKEY_scsi_sn_default=${sn:0:8}
+ : ${OCF_RESKEY_scsi_sn=${OCF_RESKEY_scsi_sn_default}}
+ OCF_RESKEY_allowed_initiators_default=""
More information about the svn-ports-all
mailing list