[arch-commits] Commit in iputils/trunk (3 files)

[Stéphane Gaudreault]

    Date: Tuesday, November 6, 2012 @ 09:23:18
  Author: stephane
Revision: 170364

upgpkg: iputils 20121106-1

upstream update

Modified:
  iputils/trunk/PKGBUILD
Deleted:
  iputils/trunk/iputils-20101006-ping-integer-overflow.patch
  iputils/trunk/iputils-20121011-flood.patch

----------------------------------------------+
 PKGBUILD                                     |   23 ++++++-----------------
 iputils-20101006-ping-integer-overflow.patch |   11 -----------
 iputils-20121011-flood.patch                 |   22 ----------------------
 3 files changed, 6 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-06 14:16:10 UTC (rev 170363)
+++ PKGBUILD	2012-11-06 14:23:18 UTC (rev 170364)
@@ -4,8 +4,8 @@
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=iputils
-pkgver=20121011
-pkgrel=2
+pkgver=20121106
+pkgrel=1
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,13 +18,10 @@
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
-        iputils-20101006-ping-integer-overflow.patch
-        iputils-20121011-flood.patch)
-sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ec78574d798b53e4f8bdd37e42514fc17ed71667'
-          '2343edf0dce28030e43305cefedd60806bb58eae')
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
+        tftp.xinetd)
+sha1sums=('9570832f3945bb5f0e89f5837facc8fdca3b7769'
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
@@ -32,12 +29,6 @@
   # Use our CFLAGS
   sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
 
-  # FS#28897
-  patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
-
-  # FS#32306
-  patch -Np1 -i ../iputils-20121011-flood.patch
-
   make
 
   cd doc
@@ -72,5 +63,3 @@
   install -dm755 "${pkgdir}"/etc/xinetd.d/
   install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
 }
-
-# vim:set ts=2 sw=2 et:

Deleted: iputils-20101006-ping-integer-overflow.patch
===================================================================
--- iputils-20101006-ping-integer-overflow.patch	2012-11-06 14:16:10 UTC (rev 170363)
+++ iputils-20101006-ping-integer-overflow.patch	2012-11-06 14:23:18 UTC (rev 170364)
@@ -1,11 +0,0 @@
---- iputils-s20101006/ping_common.c	2010-10-06 13:59:20.000000000 +0200
-+++ iputils-s20101006-patched/ping_common.c	2012-03-09 16:42:46.878151032 +0100
-@@ -590,7 +590,7 @@
- 
- 			/* If we are here, recvmsg() is unable to wait for
- 			 * required timeout. */
--			if (1000*next <= 1000000/(int)HZ) {
-+			if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) {
- 				/* Very short timeout... So, if we wait for
- 				 * something, we sleep for MININTERVAL.
- 				 * Otherwise, spin! */

Deleted: iputils-20121011-flood.patch
===================================================================
--- iputils-20121011-flood.patch	2012-11-06 14:16:10 UTC (rev 170363)
+++ iputils-20121011-flood.patch	2012-11-06 14:23:18 UTC (rev 170364)
@@ -1,22 +0,0 @@
---- iputils-s20121011/ping_common.h	2012-11-05 10:07:40.065281888 +0100
-+++ iputils-s20121011-new/ping_common.h	2012-11-05 10:07:22.001268362 +0100
-@@ -141,7 +141,7 @@ static inline void write_stdout(const ch
- 	do {
- 		cc = write(STDOUT_FILENO, str + o, len - o);
- 		o += cc;
--	} while (len >= o || cc < 0);
-+	} while (len > o || cc < 0);
- }
- 
- /*
---- iputils-s20121011/ping_common.c	2012-11-05 10:07:40.066281889 +0100
-+++ iputils-s20121011-new/ping_common.c	2012-11-05 10:07:22.007268368 +0100
-@@ -776,7 +776,7 @@ restamp:
- 		if (!csfailed)
- 			write_stdout("\b \b", 3);
- 		else
--			write_stdout("\bC", 1);
-+			write_stdout("\bC", 2);
- 	} else {
- 		int i;
- 		__u8 *cp, *dp;