[arch-commits] Commit in iputils/repos (16 files)
Stéphane Gaudreault
stephane at archlinux.org
Fri Jul 13 11:24:05 UTC 2012
Date: Friday, July 13, 2012 @ 07:24:04
Author: stephane
Revision: 163489
db-move: moved iputils from [testing] to [core] ( i686, x86_64)
Added:
iputils/repos/core-i686/PKGBUILD
(from rev 163488, iputils/repos/testing-i686/PKGBUILD)
iputils/repos/core-i686/iputils-20101006-ping-integer-overflow.patch
(from rev 163488, iputils/repos/testing-i686/iputils-20101006-ping-integer-overflow.patch)
iputils/repos/core-i686/iputils.install
(from rev 163488, iputils/repos/testing-i686/iputils.install)
iputils/repos/core-i686/tftp.xinetd
(from rev 163488, iputils/repos/testing-i686/tftp.xinetd)
iputils/repos/core-x86_64/PKGBUILD
(from rev 163488, iputils/repos/testing-x86_64/PKGBUILD)
iputils/repos/core-x86_64/iputils-20101006-ping-integer-overflow.patch
(from rev 163488, iputils/repos/testing-x86_64/iputils-20101006-ping-integer-overflow.patch)
iputils/repos/core-x86_64/iputils.install
(from rev 163488, iputils/repos/testing-x86_64/iputils.install)
iputils/repos/core-x86_64/tftp.xinetd
(from rev 163488, iputils/repos/testing-x86_64/tftp.xinetd)
Deleted:
iputils/repos/core-i686/PKGBUILD
iputils/repos/core-i686/iputils.install
iputils/repos/core-i686/tftp.xinetd
iputils/repos/core-x86_64/PKGBUILD
iputils/repos/core-x86_64/iputils.install
iputils/repos/core-x86_64/tftp.xinetd
iputils/repos/testing-i686/
iputils/repos/testing-x86_64/
----------------------------------------------------------+
core-i686/PKGBUILD | 137 ++++++-------
core-i686/iputils-20101006-ping-integer-overflow.patch | 11 +
core-i686/iputils.install | 22 +-
core-i686/tftp.xinetd | 20 -
core-x86_64/PKGBUILD | 137 ++++++-------
core-x86_64/iputils-20101006-ping-integer-overflow.patch | 11 +
core-x86_64/iputils.install | 22 +-
core-x86_64/tftp.xinetd | 20 -
8 files changed, 206 insertions(+), 174 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-i686/PKGBUILD 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=iputils
-pkgver=20101006
-pkgrel=3
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
-groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
-optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd')
-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=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
-
-build() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
-
- # Use our CFLAGS
- sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
- make
-
- cd doc
- for file in *.sgml; do
- xf=${file/.sgml/.xml}
- osx -xlower -xno-nl-in-tag $file > $xf || true
- sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
- docbook2man $xf
- done
-}
-
-package() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
-
- install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
-
- install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
- "${pkgdir}"/usr/sbin/
-
- install -m755 ping{,6} "${pkgdir}"/usr/bin/
- ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
-
- install -dm755 "${pkgdir}"/usr/share/man/man8
- install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
- "${pkgdir}"/usr/share/man/man8/
-
- cd "${pkgdir}"/usr/share/man/man8
- ln -sf ping.8.gz ping6.8.gz
- ln -sf tracepath.8.gz tracepath6.8.gz
-
- # FS#24768
- install -dm755 "${pkgdir}"/etc/xinetd.d/
- install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
-}
-
-# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-i686/PKGBUILD (from rev 163488, iputils/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=iputils
+pkgver=20101006
+pkgrel=4
+pkgdesc="IP Configuration Utilities (and Ping)"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.linuxfoundation.org/en/Net:Iputils"
+groups=('base')
+depends=('openssl' 'sysfsutils' 'libcap')
+optdepends=('xinetd: for tftpd')
+makedepends=('docbook2x' 'opensp')
+conflicts=('netkit-base' 'arping' 'netkit-tftpd')
+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)
+sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+ 'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+
+build() {
+ cd "${srcdir}/${pkgname}-s${pkgver}"
+
+ # 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
+ for file in *.sgml; do
+ xf=${file/.sgml/.xml}
+ osx -xlower -xno-nl-in-tag $file > $xf || true
+ sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
+ docbook2man $xf
+ done
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-s${pkgver}"
+
+ install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+
+ install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
+ "${pkgdir}"/usr/sbin/
+
+ install -m755 ping{,6} "${pkgdir}"/usr/bin/
+ ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
+
+ install -dm755 "${pkgdir}"/usr/share/man/man8
+ install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
+ "${pkgdir}"/usr/share/man/man8/
+
+ cd "${pkgdir}"/usr/share/man/man8
+ ln -sf ping.8.gz ping6.8.gz
+ ln -sf tracepath.8.gz tracepath6.8.gz
+
+ # FS#24768
+ install -dm755 "${pkgdir}"/etc/xinetd.d/
+ install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
+}
+
+# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-i686/iputils-20101006-ping-integer-overflow.patch (from rev 163488, iputils/repos/testing-i686/iputils-20101006-ping-integer-overflow.patch)
===================================================================
--- core-i686/iputils-20101006-ping-integer-overflow.patch (rev 0)
+++ core-i686/iputils-20101006-ping-integer-overflow.patch 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,11 @@
+--- 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: core-i686/iputils.install
===================================================================
--- core-i686/iputils.install 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-i686/iputils.install 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,11 +0,0 @@
-post_install() {
- setcap cap_net_raw=ep usr/bin/ping
- setcap cap_net_raw=ep usr/bin/ping6
- echo " >> Traceroute is now provided by core/traceroute"
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-i686/iputils.install (from rev 163488, iputils/repos/testing-i686/iputils.install)
===================================================================
--- core-i686/iputils.install (rev 0)
+++ core-i686/iputils.install 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,11 @@
+post_install() {
+ setcap cap_net_raw=ep usr/bin/ping
+ setcap cap_net_raw=ep usr/bin/ping6
+ echo " >> Traceroute is now provided by core/traceroute"
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: core-i686/tftp.xinetd
===================================================================
--- core-i686/tftp.xinetd 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-i686/tftp.xinetd 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,10 +0,0 @@
-service tftp
-{
- socket_type = dgram
- protocol = udp
- wait = yes
- user = nobody
- server = /usr/sbin/tftpd
- server_args = /var/tftpboot
- disable = yes
-}
Copied: iputils/repos/core-i686/tftp.xinetd (from rev 163488, iputils/repos/testing-i686/tftp.xinetd)
===================================================================
--- core-i686/tftp.xinetd (rev 0)
+++ core-i686/tftp.xinetd 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,10 @@
+service tftp
+{
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+ user = nobody
+ server = /usr/sbin/tftpd
+ server_args = /var/tftpboot
+ disable = yes
+}
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-x86_64/PKGBUILD 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=iputils
-pkgver=20101006
-pkgrel=3
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
-groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
-optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd')
-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=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
-
-build() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
-
- # Use our CFLAGS
- sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
- make
-
- cd doc
- for file in *.sgml; do
- xf=${file/.sgml/.xml}
- osx -xlower -xno-nl-in-tag $file > $xf || true
- sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
- docbook2man $xf
- done
-}
-
-package() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
-
- install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
-
- install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
- "${pkgdir}"/usr/sbin/
-
- install -m755 ping{,6} "${pkgdir}"/usr/bin/
- ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
-
- install -dm755 "${pkgdir}"/usr/share/man/man8
- install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
- "${pkgdir}"/usr/share/man/man8/
-
- cd "${pkgdir}"/usr/share/man/man8
- ln -sf ping.8.gz ping6.8.gz
- ln -sf tracepath.8.gz tracepath6.8.gz
-
- # FS#24768
- install -dm755 "${pkgdir}"/etc/xinetd.d/
- install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
-}
-
-# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-x86_64/PKGBUILD (from rev 163488, iputils/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=iputils
+pkgver=20101006
+pkgrel=4
+pkgdesc="IP Configuration Utilities (and Ping)"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.linuxfoundation.org/en/Net:Iputils"
+groups=('base')
+depends=('openssl' 'sysfsutils' 'libcap')
+optdepends=('xinetd: for tftpd')
+makedepends=('docbook2x' 'opensp')
+conflicts=('netkit-base' 'arping' 'netkit-tftpd')
+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)
+sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+ 'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+
+build() {
+ cd "${srcdir}/${pkgname}-s${pkgver}"
+
+ # 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
+ for file in *.sgml; do
+ xf=${file/.sgml/.xml}
+ osx -xlower -xno-nl-in-tag $file > $xf || true
+ sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
+ docbook2man $xf
+ done
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-s${pkgver}"
+
+ install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+
+ install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
+ "${pkgdir}"/usr/sbin/
+
+ install -m755 ping{,6} "${pkgdir}"/usr/bin/
+ ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
+
+ install -dm755 "${pkgdir}"/usr/share/man/man8
+ install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
+ "${pkgdir}"/usr/share/man/man8/
+
+ cd "${pkgdir}"/usr/share/man/man8
+ ln -sf ping.8.gz ping6.8.gz
+ ln -sf tracepath.8.gz tracepath6.8.gz
+
+ # FS#24768
+ install -dm755 "${pkgdir}"/etc/xinetd.d/
+ install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
+}
+
+# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-x86_64/iputils-20101006-ping-integer-overflow.patch (from rev 163488, iputils/repos/testing-x86_64/iputils-20101006-ping-integer-overflow.patch)
===================================================================
--- core-x86_64/iputils-20101006-ping-integer-overflow.patch (rev 0)
+++ core-x86_64/iputils-20101006-ping-integer-overflow.patch 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,11 @@
+--- 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: core-x86_64/iputils.install
===================================================================
--- core-x86_64/iputils.install 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-x86_64/iputils.install 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,11 +0,0 @@
-post_install() {
- setcap cap_net_raw=ep usr/bin/ping
- setcap cap_net_raw=ep usr/bin/ping6
- echo " >> Traceroute is now provided by core/traceroute"
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: iputils/repos/core-x86_64/iputils.install (from rev 163488, iputils/repos/testing-x86_64/iputils.install)
===================================================================
--- core-x86_64/iputils.install (rev 0)
+++ core-x86_64/iputils.install 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,11 @@
+post_install() {
+ setcap cap_net_raw=ep usr/bin/ping
+ setcap cap_net_raw=ep usr/bin/ping6
+ echo " >> Traceroute is now provided by core/traceroute"
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: core-x86_64/tftp.xinetd
===================================================================
--- core-x86_64/tftp.xinetd 2012-07-13 10:14:32 UTC (rev 163488)
+++ core-x86_64/tftp.xinetd 2012-07-13 11:24:04 UTC (rev 163489)
@@ -1,10 +0,0 @@
-service tftp
-{
- socket_type = dgram
- protocol = udp
- wait = yes
- user = nobody
- server = /usr/sbin/tftpd
- server_args = /var/tftpboot
- disable = yes
-}
Copied: iputils/repos/core-x86_64/tftp.xinetd (from rev 163488, iputils/repos/testing-x86_64/tftp.xinetd)
===================================================================
--- core-x86_64/tftp.xinetd (rev 0)
+++ core-x86_64/tftp.xinetd 2012-07-13 11:24:04 UTC (rev 163489)
@@ -0,0 +1,10 @@
+service tftp
+{
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+ user = nobody
+ server = /usr/sbin/tftpd
+ server_args = /var/tftpboot
+ disable = yes
+}
More information about the arch-commits
mailing list