aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefan@FreeBSD.org>2008-10-16 18:07:22 +0000
committerStefan Walter <stefan@FreeBSD.org>2008-10-16 18:07:22 +0000
commit6f3ef44893a3c09c0243b17ee94bbe41f4c4be65 (patch)
treeaa471872f3b742b581766884a4346c98be78a44a
parentbb44e8c436b4be01bb40b3153790ff0438ea3bfc (diff)
downloadports-6f3ef44893a3c09c0243b17ee94bbe41f4c4be65.tar.gz
ports-6f3ef44893a3c09c0243b17ee94bbe41f4c4be65.zip
Fix detection of interfaces.
PR: 126628 Submitted by: Oleg Gawriloff <barzog@telecom.by> Approved by: maintainer
Notes
Notes: svn path=/head/; revision=221654
-rw-r--r--sysutils/heartbeat/Makefile2
-rw-r--r--sysutils/heartbeat/files/patch-heartbeat_resource.d_IPaddr.in11
-rw-r--r--sysutils/heartbeat2/Makefile2
-rw-r--r--sysutils/heartbeat2/files/patch-heartbeat_resource.d_IPaddr.in11
4 files changed, 24 insertions, 2 deletions
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 46d184fbb40d..ab0beaf745e5 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= heartbeat
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
diff --git a/sysutils/heartbeat/files/patch-heartbeat_resource.d_IPaddr.in b/sysutils/heartbeat/files/patch-heartbeat_resource.d_IPaddr.in
new file mode 100644
index 000000000000..d747b52952bc
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-heartbeat_resource.d_IPaddr.in
@@ -0,0 +1,11 @@
+--- heartbeat/resource.d/IPaddr.in.orig 2008-10-16 19:49:31.000000000 +0200
++++ heartbeat/resource.d/IPaddr.in 2008-10-16 19:51:23.000000000 +0200
+@@ -105,7 +105,7 @@
+
+ case $SYSTYPE in
+ *BSD)
+- $IFCONFIG | grep "$ipaddr" -B4 | grep "UP," | cut -d ":" -f 1
++ $IFCONFIG | grep "$ipaddr " -B20 | grep "UP," | tail -n 1 | cut -d ":" -f 1
+ return 0;;
+ *)
+ : "comparing $ipaddr to $addr (from ifconfig)"
diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile
index 46d184fbb40d..ab0beaf745e5 100644
--- a/sysutils/heartbeat2/Makefile
+++ b/sysutils/heartbeat2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= heartbeat
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
diff --git a/sysutils/heartbeat2/files/patch-heartbeat_resource.d_IPaddr.in b/sysutils/heartbeat2/files/patch-heartbeat_resource.d_IPaddr.in
new file mode 100644
index 000000000000..d747b52952bc
--- /dev/null
+++ b/sysutils/heartbeat2/files/patch-heartbeat_resource.d_IPaddr.in
@@ -0,0 +1,11 @@
+--- heartbeat/resource.d/IPaddr.in.orig 2008-10-16 19:49:31.000000000 +0200
++++ heartbeat/resource.d/IPaddr.in 2008-10-16 19:51:23.000000000 +0200
+@@ -105,7 +105,7 @@
+
+ case $SYSTYPE in
+ *BSD)
+- $IFCONFIG | grep "$ipaddr" -B4 | grep "UP," | cut -d ":" -f 1
++ $IFCONFIG | grep "$ipaddr " -B20 | grep "UP," | tail -n 1 | cut -d ":" -f 1
+ return 0;;
+ *)
+ : "comparing $ipaddr to $addr (from ifconfig)"