From: Ivan Rako <ivan.rako@srce.hr>
Date: Fri, 27 Apr 2018 07:47:47 +0000 (+0200)
Subject: Minimalne izmjene u paketu za Debian stretch
X-Git-Tag: debian/3.2.0^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=b483296f7365f680585b2d1dbb55a316bb075126;p=carnet-upgrade.git

Minimalne izmjene u paketu za Debian stretch
---

diff --git a/debian/changelog b/debian/changelog
index df7a006..acfdf58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+carnet-tools-cn (3.2.0) stable; urgency=low
+
+  * Minimalne izmjene u paketu za Debian stretch
+  * Izmjene u funkcijama cp_get_ifaddr i cp_get_ifmask zbog drugacijeg
+    outputa naredbe ifconfig
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Fri, 27 Apr 2018 09:28:03 +0200
+
 carnet-tools-cn (3.1.0) stable; urgency=low
 
   * Minimalne izmjene u paketu za Debian jessie
diff --git a/debian/control b/debian/control
index 79c0b6b..5af6507 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: utils
 Priority: optional
 Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
 Build-Depends: debhelper (>= 9.20120909)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
 
 Package: carnet-tools-cn
 Architecture: all
-Depends: perl-base (>= 5.14.2-21), coreutils (>= 8.13-3.5), debianutils (>= 4.3.2), ipcalc, net-tools, ${misc:Depends}, ${perl:Depends}
+Depends: perl-base (>= 5.14.2-21), coreutils (>= 8.13-3.5), debianutils (>= 4.3.2), ipcalc, net-tools (>= 1.60+git20161116.90da8a0-1), ${misc:Depends}, ${perl:Depends}
 Suggests: mail-transport-agent
 Conflicts: carnet-tools
 Provides: carnet-tools
diff --git a/functions.sh b/functions.sh
index dc3450d..37bd113 100644
--- a/functions.sh
+++ b/functions.sh
@@ -27,7 +27,8 @@ cp_get_ifaddr() {
     return 2
   fi
 
-  ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  #ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf($2) }'`"
 
   if [ -z $ifaddr ]; then
     echo "cp_get_ifaddr: $interface: No ip address found" 1>&2
@@ -63,7 +64,8 @@ cp_get_ifmask() {
     return 1
   fi
 
-  ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  #ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  ifmask="`/sbin/ifconfig $interface | awk '/netmask /{ printf($4) }'`"
 
   if [ -z "$ifmask" ]; then
     echo "cp_get_ifmask: $interface: No netmask found" 1>&2