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 =================================================================== --- PKGBUILD 2012-11-26 16:23:15 UTC (rev 172029) +++ PKGBUILD 2012-11-26 16:26:03 UTC (rev 172030) @@ -4,7 +4,7 @@ # Contributor: Aaron Griffin <[email protected]> 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.patch 2012-11-26 16:23:15 UTC (rev 172029) +++ iputils-20121114-free-unintialized.patch 2012-11-26 16:26:03 UTC (rev 172030) @@ -1,36 +0,0 @@ -From: Jan Synacek <[email protected]> -Date: Wed, 14 Nov 2012 12:57:16 +0000 (+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 <[email protected]> ---- - -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) {
