[arch-commits] Commit in iputils/trunk (2 files)
Date: Monday, November 26, 2012 @ 11:26:03
Author: stephane
Revision: 172030
upgpkg: iputils 20121126-1
upstream update
Modified:
iputils/trunk/PKGBUILD
Deleted:
iputils/trunk/iputils-20121114-free-unintialized.patch
--+
PKGBUILD | 12 +++--
iputils-20121114-free-unintialized.patch | 36 -
2 files changed, 4 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-26 16:23:15 UTC (rev 172029)
+++ PKGBUILD2012-11-26 16:26:03 UTC (rev 172030)
@@ -4,7 +4,7 @@
# Contributor: Aaron Griffin aa...@archlinux.org
pkgname=iputils
-pkgver=20121114
+pkgver=20121126
pkgrel=1
pkgdesc=Network monitoring tools, including ping
arch=('i686' 'x86_64')
@@ -19,17 +19,13 @@
backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
-tftp.xinetd
-iputils-20121114-free-unintialized.patch)
-sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
- '7f1262f4bed7fa122ea86f09cb81d817adbd8164')
+tftp.xinetd)
+sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
build() {
cd ${srcdir}/${pkgname}-s${pkgver}
- patch -Np1 -i ../iputils-20121114-free-unintialized.patch
-
# Use our CFLAGS
sed -i -e /^CCOPT=/s|-O2|${CFLAGS}| Makefile
Deleted: iputils-20121114-free-unintialized.patch
===
--- iputils-20121114-free-unintialized.patch2012-11-26 16:23:15 UTC (rev
172029)
+++ iputils-20121114-free-unintialized.patch2012-11-26 16:26:03 UTC (rev
172030)
@@ -1,36 +0,0 @@
-From: Jan Synacek jsyna...@redhat.com
-Date: Wed, 14 Nov 2012 12:57:16 + (+0100)
-Subject: ping: Don't free an unintialized value.
-X-Git-Url:
http://www.linux-ipv6.org/gitweb/gitweb.cgi?p=gitroot%2Fiputils.git;a=commitdiff_plain;h=44c6c9a8d3f3fc65fc52e5957bfd4cc4634f0006
-
-ping: Don't free an unintialized value.
-
-Signed-off-by: YOSHIFUJI Hideaki yoshf...@linux-ipv6.org
-
-diff --git a/ping.c b/ping.c
-index fe9ff8a..9de3d08 100644
a/ping.c
-+++ b/ping.c
-@@ -122,7 +122,7 @@ main(int argc, char **argv)
- u_char *packet;
- char *target;
- #ifdef USE_IDN
-- char *hnamebuf;
-+ char *hnamebuf = NULL;
- #else
- char hnamebuf[MAX_HOSTNAMELEN];
- #endif
-@@ -263,8 +263,10 @@ main(int argc, char **argv)
- #ifdef USE_IDN
- int rc;
-
-- free(hnamebuf);
-- hnamebuf = NULL;
-+ if (hnamebuf) {
-+ free(hnamebuf);
-+ hnamebuf = NULL;
-+ }
-
- rc = idna_to_ascii_lz(target, idn, 0);
- if (rc != IDNA_SUCCESS) {
[arch-commits] Commit in iputils/trunk (2 files)
Date: Wednesday, November 14, 2012 @ 11:39:44
Author: stephane
Revision: 171002
upgpkg: iputils 20121114-1
upstream update
Added:
iputils/trunk/iputils-20121114-free-unintialized.patch
Modified:
iputils/trunk/PKGBUILD
--+
PKGBUILD | 18 --
iputils-20121114-free-unintialized.patch | 36 +
2 files changed, 47 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-14 16:24:29 UTC (rev 171001)
+++ PKGBUILD2012-11-14 16:39:44 UTC (rev 171002)
@@ -4,12 +4,12 @@
# Contributor: Aaron Griffin aa...@archlinux.org
pkgname=iputils
-pkgver=20121106
+pkgver=20121114
pkgrel=1
-pkgdesc=IP Configuration Utilities (and Ping)
+pkgdesc=Network monitoring tools, including ping
arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.linuxfoundation.org/en/Net:Iputils;
+license=('GPL' 'BSD')
+url=http://www.skbuff.net/iputils/;
groups=('base')
depends=('openssl' 'sysfsutils' 'libcap')
optdepends=('xinetd: for tftpd')
@@ -19,13 +19,17 @@
backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
-tftp.xinetd)
-sha1sums=('9570832f3945bb5f0e89f5837facc8fdca3b7769'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
+tftp.xinetd
+iputils-20121114-free-unintialized.patch)
+sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+ '7f1262f4bed7fa122ea86f09cb81d817adbd8164')
build() {
cd ${srcdir}/${pkgname}-s${pkgver}
+ patch -Np1 -i ../iputils-20121114-free-unintialized.patch
+
# Use our CFLAGS
sed -i -e /^CCOPT=/s|-O2|${CFLAGS}| Makefile
Added: iputils-20121114-free-unintialized.patch
===
--- iputils-20121114-free-unintialized.patch(rev 0)
+++ iputils-20121114-free-unintialized.patch2012-11-14 16:39:44 UTC (rev
171002)
@@ -0,0 +1,36 @@
+From: Jan Synacek jsyna...@redhat.com
+Date: Wed, 14 Nov 2012 12:57:16 + (+0100)
+Subject: ping: Don't free an unintialized value.
+X-Git-Url:
http://www.linux-ipv6.org/gitweb/gitweb.cgi?p=gitroot%2Fiputils.git;a=commitdiff_plain;h=44c6c9a8d3f3fc65fc52e5957bfd4cc4634f0006
+
+ping: Don't free an unintialized value.
+
+Signed-off-by: YOSHIFUJI Hideaki yoshf...@linux-ipv6.org
+---
+
+diff --git a/ping.c b/ping.c
+index fe9ff8a..9de3d08 100644
+--- a/ping.c
b/ping.c
+@@ -122,7 +122,7 @@ main(int argc, char **argv)
+ u_char *packet;
+ char *target;
+ #ifdef USE_IDN
+- char *hnamebuf;
++ char *hnamebuf = NULL;
+ #else
+ char hnamebuf[MAX_HOSTNAMELEN];
+ #endif
+@@ -263,8 +263,10 @@ main(int argc, char **argv)
+ #ifdef USE_IDN
+ int rc;
+
+- free(hnamebuf);
+- hnamebuf = NULL;
++ if (hnamebuf) {
++ free(hnamebuf);
++ hnamebuf = NULL;
++ }
+
+ rc = idna_to_ascii_lz(target, idn, 0);
+ if (rc != IDNA_SUCCESS) {
[arch-commits] Commit in iputils/trunk (2 files)
Date: Thursday, July 12, 2012 @ 06:23:52
Author: stephane
Revision: 163461
upgpkg: iputils 20101006-4
Fix an integer overflow
Added:
iputils/trunk/iputils-20101006-ping-integer-overflow.patch
Modified:
iputils/trunk/PKGBUILD
--+
PKGBUILD | 11 ---
iputils-20101006-ping-integer-overflow.patch | 11 +++
2 files changed, 19 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-12 07:52:05 UTC (rev 163460)
+++ PKGBUILD2012-07-12 10:23:52 UTC (rev 163461)
@@ -5,7 +5,7 @@
pkgname=iputils
pkgver=20101006
-pkgrel=3
+pkgrel=4
pkgdesc=IP Configuration Utilities (and Ping)
arch=('i686' 'x86_64')
license=('GPL')
@@ -18,9 +18,11 @@
replaces=('netkit-base')
backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
tftp.xinetd)
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
tftp.xinetd
+iputils-20101006-ping-integer-overflow.patch)
sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+ 'ec78574d798b53e4f8bdd37e42514fc17ed71667')
build() {
cd ${srcdir}/${pkgname}-s${pkgver}
@@ -28,6 +30,9 @@
# Use our CFLAGS
sed -i -e /^CCOPT=/s|-O2|${CFLAGS}| Makefile
+ # FS#28897
+ patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch
+
make
cd doc
Added: iputils-20101006-ping-integer-overflow.patch
===
--- iputils-20101006-ping-integer-overflow.patch
(rev 0)
+++ iputils-20101006-ping-integer-overflow.patch2012-07-12 10:23:52 UTC
(rev 163461)
@@ -0,0 +1,11 @@
+--- iputils-s20101006/ping_common.c2010-10-06 13:59:20.0 +0200
iputils-s20101006-patched/ping_common.c2012-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 = 100/(int)HZ) {
++ if (((uint64_t)1000*next) = (uint64_t)100/(int)HZ)
{
+ /* Very short timeout... So, if we wait for
+* something, we sleep for MININTERVAL.
+* Otherwise, spin! */
