commit 6c58bd681392d5f3b9aaa6dbe82fce1042fc43dc Author: Matt Housh <jaeger@crux.nu> Date: Thu Jan 10 08:24:42 2008 -0600 iputils: updated to version s20071127 diff --git a/iputils/.footprint b/iputils/.footprint index 45801e4..6c51f78 100644 --- a/iputils/.footprint +++ b/iputils/.footprint @@ -6,16 +6,15 @@ drwxr-xr-x root/root sbin/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ --rwxr-xr-x root/root usr/man/man8/arping.8.gz --rwxr-xr-x root/root usr/man/man8/clockdiff.8.gz --rwxr-xr-x root/root usr/man/man8/pg3.8.gz --rwxr-xr-x root/root usr/man/man8/ping.8.gz +-rw-r--r-- root/root usr/man/man8/arping.8.gz +-rw-r--r-- root/root usr/man/man8/clockdiff.8.gz +-rw-r--r-- root/root usr/man/man8/ping.8.gz lrwxrwxrwx root/root usr/man/man8/ping6.8.gz -> ping.8.gz --rwxr-xr-x root/root usr/man/man8/rarpd.8.gz --rwxr-xr-x root/root usr/man/man8/rdisc.8.gz --rwxr-xr-x root/root usr/man/man8/tftpd.8.gz --rwxr-xr-x root/root usr/man/man8/tracepath.8.gz --rwxr-xr-x root/root usr/man/man8/traceroute6.8.gz +-rw-r--r-- root/root usr/man/man8/rarpd.8.gz +-rw-r--r-- root/root usr/man/man8/rdisc.8.gz +-rw-r--r-- root/root usr/man/man8/tftpd.8.gz +-rw-r--r-- root/root usr/man/man8/tracepath.8.gz +-rw-r--r-- root/root usr/man/man8/traceroute6.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/clockdiff -rwxr-xr-x root/root usr/sbin/ipg diff --git a/iputils/.md5sum b/iputils/.md5sum index e5fdc3b..55e6b56 100644 --- a/iputils/.md5sum +++ b/iputils/.md5sum @@ -1,3 +1,2 @@ -ef1e642cbeba37c8ce62770175d9809d iputils-ipg-linux26.patch -de7c2ee91ca1e85513e339bcf5af3d06 iputils-ss021109-try.patch -dd10ef3d76480990a2174d2bb0daddaf iputils-ss021109-try.tar.bz2 +91ec714aed9abdb1c91eb7b75b59290f iputils-man-s20071127.tar.bz2 +12245e9927d60ff5cf4a99d265bcb7d3 iputils-s20071127.tar.bz2 diff --git a/iputils/Pkgfile b/iputils/Pkgfile index d87bf9c..36a3108 100644 --- a/iputils/Pkgfile +++ b/iputils/Pkgfile @@ -1,30 +1,23 @@ # Description: Basic networking applet -# URL: http://linux-net.osdl.org/index.php/Iputils +# URL: http://www.linux-foundation.org/en/Net:Iputils # Maintainer: Matt Housh, jaeger at morpheus dot net +# Packager: Juergen Daubert, juergen dot daubert at t-online dot de name=iputils -version=ss021109-try -release=4 -source=(ftp://ftp.inr.ac.ru/ip-routing/$name-$version.tar.bz2 \ - $name-ipg-linux26.patch $name-$version.patch) +version=s20071127 +release=1 +source=(http://www.skbuff.net/iputils/$name-$version.tar.bz2 \ + http://crux.nu/~jue/files/dist/$name-man-$version.tar.bz2) build() { - cd $name - patch -i $SRC/$name-$version.patch Makefile - patch -i $SRC/$name-ipg-linux26.patch ipg - sed -i -e "/^CCOPT=/s|-O2|$CFLAGS|" \ - -e '/^CCOPT=/s| -g$||' \ - Makefile + cd $name-$version + sed -i "/^CCOPT=/s|-O2|$CFLAGS|;s| -g$||" Makefile make - make man - mkdir -p $PKG/{{s,}bin,usr/{man/man8,sbin}} + install -d $PKG/{{s,}bin,usr/{man/man8,sbin}} install ping{,6} $PKG/bin/ install arping $PKG/sbin/ - install tracepath{,6} traceroute6 clockdiff rarpd rdisc \ - ipg tftpd $PKG/usr/sbin/ - install doc/*.8 $PKG/usr/man/man8 - rm -f $PKG/usr/man/man8/setkey* - ln -s ping.8 $PKG/usr/man/man8/ping6.8 + install tracepath{,6} traceroute6 clockdiff rarpd rdisc ipg tftpd $PKG/usr/sbin/ + cp -d $SRC/$name-man-$version/* $PKG/usr/man/man8 chmod u+s $PKG/bin/ping{,6} $PKG/usr/sbin/traceroute6 } diff --git a/iputils/iputils-ipg-linux26.patch b/iputils/iputils-ipg-linux26.patch deleted file mode 100644 index a87b340..0000000 --- a/iputils/iputils-ipg-linux26.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- iputils/ipg.orig 2005-01-03 22:47:26.314393976 -0500 -+++ iputils/ipg 2005-01-03 22:49:09.686679000 -0500 -@@ -1,21 +1,31 @@ --#! /bin/bash -+#!/bin/bash - --modprobe pg3 -+modprobe pg3 >& /dev/null -+modprobe pktgen >& /dev/null -+ -+PGDEV=/proc/net/pg -+if [[ ! -e ${PGDEV} ]] ; then -+ PGDEV=/proc/net/pktgen/pg0 -+ if [[ ! -e ${PGDEV} ]] ; then -+ echo "Couldn't locate pg in /proc/net!" -+ exit 1 -+ fi -+fi - - function pgset() { - local result - -- echo $1 > /proc/net/pg -+ echo $1 > ${PGDEV} - -- result=`cat /proc/net/pg | fgrep "Result: OK:"` -+ result=`cat ${PGDEV} | fgrep "Result: OK:"` - if [ "$result" = "" ]; then -- cat /proc/net/pg | fgrep Result: -+ cat ${PGDEV} | fgrep Result: - fi - } - - function pg() { -- echo inject > /proc/net/pg -- cat /proc/net/pg -+ echo inject > ${PGDEV} -+ cat ${PGDEV} - } - - pgset "odev eth0" diff --git a/iputils/iputils-ss021109-try.patch b/iputils/iputils-ss021109-try.patch deleted file mode 100644 index 20ca58a..0000000 --- a/iputils/iputils-ss021109-try.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.orig 2007-02-22 09:10:41.000000000 -0600 -+++ Makefile 2007-02-22 09:13:35.000000000 -0600 -@@ -1,5 +1,4 @@ - # Path to parent kernel include files directory --KERNEL_INCLUDE=/usr/src/linux/include - LIBC_INCLUDE=/usr/include - - DEFINES= -@@ -17,12 +16,6 @@ - GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h - endif - --ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h)) -- SUBDIRS=libipsec setkey -- LDLIBS+=-Llibipsec -lipsec -- IPSECDEF=-DDO_IPSEC -Ilibipsec --endif -- - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv - # NOT AVAILABLE. Please, use libresolv. -@@ -37,7 +30,7 @@ - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --all: check-kernel subdirs $(TARGETS) -+all: subdirs $(TARGETS) - - - tftpd: tftpd.o tftpsubs.o