diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-17 01:32:38 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-17 01:32:38 -0800 |
| commit | 071ecd58a9b69020ec170e7f89009a603e885371 (patch) | |
| tree | c32fc487de5e9afc5bb12c053775982fdd2c6b7d /core | |
| parent | 99c34471cedb5de3afae4e33c48239abbe1410c7 (diff) | |
Sat Nov 17 01:27:29 PST 2012
Diffstat (limited to 'core')
| -rw-r--r-- | core/iputils/PKGBUILD | 20 | ||||
| -rw-r--r-- | core/iputils/iputils-20121114-free-unintialized.patch | 36 |
2 files changed, 48 insertions, 8 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 4d6709d56..154d4ae0a 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 170801 2012-11-11 22:35:51Z stephane $ +# $Id: PKGBUILD 171270 2012-11-16 23:40:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@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 @@ replaces=('netkit-base') 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 diff --git a/core/iputils/iputils-20121114-free-unintialized.patch b/core/iputils/iputils-20121114-free-unintialized.patch new file mode 100644 index 000000000..524b640ea --- /dev/null +++ b/core/iputils/iputils-20121114-free-unintialized.patch @@ -0,0 +1,36 @@ +From: Jan Synacek <jsynacek@redhat.com> +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 <yoshfuji@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) { |