Fix an off-by-one.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 54 insertions, 15 deletions

diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index 5fc5351df0bb..c8bee41ea3dc 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/airtraf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.19 2014/07/18 21:54:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.20 2014/07/19 12:26:37 jer Exp $
+
+*airtraf-1.1-r2 (19 Jul 2014)
+
+  19 Jul 2014; Jeroen Roovers <jer@gentoo.org> -airtraf-1.1-r1.ebuild,
+  +airtraf-1.1-r2.ebuild, +files/airtraf-1.1-off-by-one.patch,
+  files/airtraf-1.1.patch:
+  Fix an off-by-one.
 
   18 Jul 2014; Jeroen Roovers <jer@gentoo.org> airtraf-1.1-r1.ebuild,
   metadata.xml:
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index a526e56814ad..46cd571b72b1 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX airtraf-1.1.patch 1987 SHA256 cf95ca53fecb45bd18cd930c1855a9f7d4b801d215934e345a43c0894bf75aa5 SHA512 78b0059a0ecda3eb3cd2f892dff1a09018843dedf8043849eb6a0af1c6daa77e205db28d94968b3e9e92f8e4bbc9faa17b215b7394d50e8512154a697b488940 WHIRLPOOL 503bc04ca50f762156aad3a682eddd63bb0c257f90866374ba8a7b06aa0c55fd588df415375c7f8ceb49d903c4862bdacbf1a032d870fec378490f31048097be
+AUX airtraf-1.1-off-by-one.patch 744 SHA256 38585a0b5a1cba5403bd0744e9b1e6f0358875a644167b26a11dc4a502194811 SHA512 c19194498b2169a4ac20f20e51ea197bc9c96f5150a730a299375ea8d6babb4e498246fd8faf93d7dc285ca8a21d300a33102b2860868c7b9b02c89bd818c1fb WHIRLPOOL 833cad724319c66156d7c2f99e395540ba251e54dc25e82295ef207fdfbf99bde347fa0e781554a4a66419b01757430ab5fec40fe857b2cb9c345f9096711169
+AUX airtraf-1.1.patch 1919 SHA256 6d52c80274cb072a6d460f7188b0227111c8008a28fc62b1e7143842e7be15a6 SHA512 c1aecbad368acfa47954c909858c0c55f23457e5998e87d785e12da1d699571c41364cf3703c9b540cc784560090adde169af2cef34607f88e205a83278d5afe WHIRLPOOL e47937282a6fa788188a587862dbdf25bf8a0c54bbdcc749a41d6664ad2660311070e77849a136e1ad2ed937b9f1a79dab2b1e45319b4183f1130f1d358a3c00
 DIST airtraf-1.1.tar.gz 136241 SHA256 10ad27d6cac5ac7fcfec04cd737a0d8a640d5bfeb6fa48a13268f9efbe6bfe53 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b WHIRLPOOL de40aca3c5cacd5e5047b175e2538dba3ef90af1afb14dcb9a9e1ffab66fa3ddc0aee75aa916183a25f82906c108f3a7e9a177a2228858b2909c44a15a5227c7
-EBUILD airtraf-1.1-r1.ebuild 1095 SHA256 7a0804d975a73e354da84c6ac4daf6a7a9c36163859c3933658f78b5a3502549 SHA512 10731fe1f11b83a88923d434a67d63bb31181a49f0080dde30a90d495e60bb5954df39661f7900b867b62731e354f5bc71f06087eac4f50f725cb684ab929e85 WHIRLPOOL de1a2b005ee29bbcc48fe8297e2a0cd7f1b8e95eff1fa4c4f3ea8c79aac49c645c2d072f10130abe4b30c9501afcf99863bbd9a4c197de5feecca204120c47bb
+EBUILD airtraf-1.1-r2.ebuild 1139 SHA256 fde9357eb96d1e57d2f86d629450b7647c4ded2839a23d0fbca19bbb12968e91 SHA512 930f066303045c877b3bdd313559c87d91462d5385ed8b847d6ce64865160febce8ca1e69facbfd860c9ddb47c4fe109c8a382e906a6e7d9ee5099538b0b4593 WHIRLPOOL b0ccd34ebae50a60b5de8f3c8258dde3fdbf35f43d7fe1a3f95546ff82d0551e531a3235361f2ad20b09eb2a1a1a5e48c1fef487290f75cbe58b711411ef3f32
 EBUILD airtraf-1.1.ebuild 1017 SHA256 8d6a66383394da39486a9c7cfcad801a48589ae483b064e87eddd3bbd3d242ab SHA512 2a1df10660214c298f990e537ad638477bc691680dc5fff57402fe6526bb855dc1ba85f5f26264129baf036d21aa27733aef4f07efe64c54549491650c4ce847 WHIRLPOOL 8ab25ad5eb1c56ec3454741d264dc75cf26686dbfae8e77fdf431b88c996d335c8fafa9a05d744b1b0837ddf6e2b0f763e5f7884b725c116f2d9c71ddb63fcac
-MISC ChangeLog 2633 SHA256 bda75079eb5d636244f989169bced11ea29f7346a6cfcadc06de0d6de0e5a9db SHA512 872e77eed5ebd58e896779d9b14c2ab86d3203a2c56c7043be6f11808962dd63dc72555ed1d99b3e633dc9b1b34bcf868df23a91a24006d1c088793414d52e1b WHIRLPOOL 43c9b8697ae687f75aff827355ac48b6c4c4ba98e02b5097786d51efffcb72e08b6d26180d47c898b51bc8895c59384ef675ed83ea31240dcb69acaf667a3a5b
+MISC ChangeLog 2847 SHA256 b8d5eb6165d465497987773a9673565d447de905e216e9e5b75c10cbfa4cc348 SHA512 3b08bcaeae68010f17ed66224fda1fe456ce5b88c55211f031baa1fa4ab86d6ce2ad25050d401ae0c370cf2a7a275321bfedb52d769e729eea35bc5e5b9f013d WHIRLPOOL 00183a8a8393e6c133828e80d9330af3dca847f187f9c81bd9d3261228b80f33a7b719380a85b102e454d7fa022307196265efb8019cf89f4464e5f41029d2cf
 MISC metadata.xml 567 SHA256 852aa8cf04d3200f25ed1ee5078f0ed1b7f7716ebedc80d98bad987683c6eb12 SHA512 888447e3b8885615bc75b6d9416445b3d3958f97d8f2d38e77e59f8b2aabc8c2ad74a2f71c535526e6efee4065f0315428c1f44643304f7d311e8f6f4808899b WHIRLPOOL 755b76ae2c32e2652adcb113afbf155247f7f5af385551a40ba3fc2fad2e22435c1573c8abde8b028818036d35a526917edb11bf681a0a9dc27494df130e3605
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPJl7MACgkQVWmRsqeSphNwrQCfWZiiy3GxT3lihb1eM+wT5pgx
-MnwAnjuoXztPDLt72nBx2Z0QW/So156u
-=7Buo
+iEYEAREIAAYFAlPKY/8ACgkQVWmRsqeSphPK4gCaA1wos1UADhW4I1BXOBluIUdu
+dM0AnjAtwPiSCqtSbVbZXN4UFN0+QCJ0
+=cWD0
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/airtraf/airtraf-1.1-r1.ebuild b/net-wireless/airtraf/airtraf-1.1-r2.ebuild
index 1293f53fb24c..dfaf0ae85994 100644
--- a/net-wireless/airtraf/airtraf-1.1-r1.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r1.ebuild,v 1.3 2014/07/18 21:54:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r2.ebuild,v 1.1 2014/07/19 12:26:37 jer Exp $
 
 EAPI=5
 
@@ -23,7 +23,9 @@ DEPEND="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
+	epatch \
+		"${FILESDIR}"/${P}.patch \
+		"${FILESDIR}"/${P}-off-by-one.patch
 	sed -i \
 		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
 		src/libncurses/Makefile || die
diff --git a/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch b/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch
new file mode 100644
index 000000000000..571532b603ec
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf-1.1-off-by-one.patch
@@ -0,0 +1,29 @@
+--- a/src/sniffd/autoconfig.c
++++ b/src/sniffd/autoconfig.c
+@@ -68,7 +68,7 @@
+   struct ifreq ifr;
+ 
+   strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+-  ifr.ifr_name[IFNAMSIZ] = '\0';
++  ifr.ifr_name[IFNAMSIZ -1] = '\0';
+   if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0){
+     return (-1);
+   }
+@@ -89,7 +89,7 @@
+   struct ifreq ifr;
+ 
+   strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+-  ifr.ifr_name[IFNAMSIZ] = '\0';
++  ifr.ifr_name[IFNAMSIZ -1] = '\0';
+   if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0){
+     return (-1);
+   }
+@@ -129,7 +129,7 @@
+ {
+   /* Set device name */
+   strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
+-  pwrq->ifr_name[IFNAMSIZ] = '\0';
++  pwrq->ifr_name[IFNAMSIZ -1] = '\0';
+   
+   /* Do the request */
+   return(ioctl(skfd, request, pwrq));
diff --git a/net-wireless/airtraf/files/airtraf-1.1.patch b/net-wireless/airtraf/files/airtraf-1.1.patch
index f1309184ae9d..976506178744 100644
--- a/net-wireless/airtraf/files/airtraf-1.1.patch
+++ b/net-wireless/airtraf/files/airtraf-1.1.patch
@@ -1,5 +1,5 @@
---- a/airtraf-1.1/src/sniffd/autoconfig.c	2003-01-24 10:11:36.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/autoconfig.c	2005-01-12 19:23:16.481439336 +0930
+--- a/src/sniffd/autoconfig.c	2003-01-24 10:11:36.000000000 +0930
++++ b/src/sniffd/autoconfig.c	2005-01-12 19:23:16.481439336 +0930
 @@ -360,7 +360,7 @@
  int check_drv_compat(char * drvname, int * id)
  {
@@ -26,8 +26,8 @@
  	
      }
      /* update flag take off PROMISC */
---- a/airtraf-1.1/src/sniffd/gui_channel_scan.c	2003-01-22 13:05:01.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/gui_channel_scan.c	2005-01-12 19:21:33.135876552 +0930
+--- a/gsrc/sniffd/gui_channel_scan.c	2003-01-22 13:05:01.000000000 +0930
++++ b/gsrc/sniffd/gui_channel_scan.c	2005-01-12 19:21:33.135876552 +0930
 @@ -384,7 +384,7 @@
  	    if (!beep()) flash();
  	    wattrset(statuswin, STDATTR);
@@ -37,8 +37,8 @@
  		     hexdump((__u8*)&ap->bssid,6), ap->channel);
  	    print_status_msg(statuswin, location, message);
  	    ap->status = AP_STATUS_ACTIVE;
---- a/airtraf-1.1/src/sniffd/server.c	2003-01-22 13:05:01.000000000 +0930
-+++ b/airtraf-1.1/src/sniffd/server.c	2005-01-12 19:21:33.135876552 +0930
+--- a/gsrc/sniffd/server.c	2003-01-22 13:05:01.000000000 +0930
++++ b/gsrc/sniffd/server.c	2005-01-12 19:21:33.135876552 +0930
 @@ -57,7 +57,7 @@
  
  int process_command(int, char *);