[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (51d1989cc4daf20ef3bb28e986c4cd1d4753009a)

Remko van der Vossen scm at sourcemage.org
Fri Feb 1 12:01:43 EST 2008


GIT changes to master grimoire by Remko van der Vossen <wich at radio0.stack.nl>:

 net/iputils-ping/BUILD                          |    3 -
 net/iputils-ping/DETAILS                        |   13 ++---
 net/iputils-ping/HISTORY                        |    5 ++
 net/iputils-ping/PRE_BUILD                      |    5 --
 net/iputils-ping/iputils-glibc-patch.patch      |   59 ------------------------
 net/iputils-tracepath/BUILD                     |    3 -
 net/iputils-tracepath/DETAILS                   |   12 ++--
 net/iputils-tracepath/HISTORY                   |    5 ++
 net/iputils-tracepath/PRE_BUILD                 |    5 --
 net/iputils-tracepath/iputils-glibc-patch.patch |   59 ------------------------
 10 files changed, 28 insertions(+), 141 deletions(-)

New commits:
commit 51d1989cc4daf20ef3bb28e986c4cd1d4753009a
Author: Remko van der Vossen <wich at radio0.stack.nl>
Commit: Remko van der Vossen <wich at radio0.stack.nl>

    net/iputils-tracepath: 20071127-1

commit 297ed2301f30196763d110d2a9c93f8451bd5c34
Author: Remko van der Vossen <wich at radio0.stack.nl>
Commit: Remko van der Vossen <wich at radio0.stack.nl>

    net/iputils-ping: 20071127-1

diff --git a/net/iputils-ping/BUILD b/net/iputils-ping/BUILD
index 0db91e2..e89d027 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1 +1,2 @@
-  make  TARGETS="ping ping6"
+make TARGETS="ping ping6" &&
+make -C doc man
diff --git a/net/iputils-ping/DETAILS b/net/iputils-ping/DETAILS
index 6f25b92..bb0809a 100755
--- a/net/iputils-ping/DETAILS
+++ b/net/iputils-ping/DETAILS
@@ -1,15 +1,14 @@
            SPELL=iputils-ping
-         VERSION=20020927-2
-      PATCHLEVEL=1
-          SOURCE=iputils_20020927.orig.tar.gz
-         SOURCE2=iputils_20020927-2.diff.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/iputils
+         VERSION=20071127-1
+          SOURCE=iputils_${VERSION:0:8}.orig.tar.gz
+         SOURCE2=iputils_${VERSION}.diff.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/iputils_${VERSION:0:8}.orig
    SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/i/iputils/$SOURCE
   SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/i/iputils/$SOURCE2
         WEB_SITE=http://packages.debian.org/unstable/net/iputils-ping.html
          ENTERED=20030509
-     SOURCE_HASH=sha512:66636d52d1788ccec3b957266116ed8b2b25e523a8438ae98659e1707e0628c7d332f840ab07cae93d121a72d99e028103d2cf0bb1b10648787817374b08e16b
-    SOURCE2_HASH=sha512:390e09a4b105952eca580bb288c4e81d9f17b909267f5cec2dc1c77346ad8c8c77da2f42b3589d92a3abfb7adfebefff81d1d94efbc013d4b3ba612d8674c58d
+     SOURCE_HASH=sha512:7791934d2110e934043d373463f758239d6706a7d87e5dfab2377523830b12aebc24c5f29da7b294df2102f3f0f00589b842eb5c74d86eb29ce1e304d5de7a7d
+    SOURCE2_HASH=sha512:3285ac37dd5645e34e373131dc562fa7d258763c505a37762c7cd5cbb61c2fbdc5548ea728c9a0571afdd13203bbe2a825b09430a0a4c7daccee9c847a8bfd15
       LICENSE[0]=GPL
             DOCS="README"
         KEYWORDS="net"
diff --git a/net/iputils-ping/HISTORY b/net/iputils-ping/HISTORY
index c5b8ecb..f2561e6 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,8 @@
+2008-02-01 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS: 20071127-1
+	* PRE_BUILD,iputils-glibc-patch.patch: remove glibc patch
+	* BUILD: also build man pages
+
 2007-05-27 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS: PATCHLEVEL++
 	  INSTALL: Fixed install permissions.
diff --git a/net/iputils-ping/PRE_BUILD b/net/iputils-ping/PRE_BUILD
index e032667..df59c1d 100755
--- a/net/iputils-ping/PRE_BUILD
+++ b/net/iputils-ping/PRE_BUILD
@@ -2,7 +2,4 @@ default_pre_build                                       &&
 cd $SOURCE_DIRECTORY                                    &&
     
 unpack_file 2                                           &&
-gunzip  -c  $SOURCE_CACHE/$SOURCE2  |  patch  -p1       &&
-        
-# Removes some silly errors.
-patch -p1 < $SCRIPT_DIRECTORY/iputils-glibc-patch.patch
+gunzip  -c  $SOURCE_CACHE/$SOURCE2  |  patch  -p1
diff --git a/net/iputils-ping/iputils-glibc-patch.patch b/net/iputils-ping/iputils-glibc-patch.patch
deleted file mode 100644
index 9ac9478..0000000
--- a/net/iputils-ping/iputils-glibc-patch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Not sure why I have to patch this myself, but at least this works for me. -- Seth
-
-diff -Nuar iputils/arping.c iputils-good/arping.c
---- iputils/arping.c	2001-10-05 15:42:47.000000000 -0700
-+++ iputils-good/arping.c	2005-11-27 23:58:16.638290000 -0800
-@@ -19,6 +19,8 @@
- #include <sys/ioctl.h>
- #include <linux/if.h>
- #include <linux/if_arp.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_packet.h>
- #include <sys/uio.h>
- 
- #include <netdb.h>
-diff -Nuar iputils/Makefile iputils-good/Makefile
---- iputils/Makefile	2005-11-28 00:01:25.859844784 -0800
-+++ iputils-good/Makefile	2005-11-27 23:47:41.821964000 -0800
-@@ -10,11 +10,11 @@
- 
- ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
-   ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
--    GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-+#    GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-   endif
- endif
- ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
--  GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-+#  GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
- endif
- 
- 
-diff -Nuar iputils/ping6.c iputils-good/ping6.c
---- iputils/ping6.c	2005-11-28 00:01:25.861844314 -0800
-+++ iputils-good/ping6.c	2005-11-27 23:59:12.866096000 -0800
-@@ -71,6 +71,9 @@
- #include <linux/in6.h>
- #include <linux/ipv6.h>
- #include <linux/icmpv6.h>
-+#include <endian.h>
-+#include <asm/byteorder.h>
-+#include <linux/byteorder/swab.h>
- 
- #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0)
- #define BIT_SET(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] |= (1U << ((nr) & 31)); } while(0)
-diff -Nuar iputils/ping.c iputils-good/ping.c
---- iputils/ping.c	2002-09-20 08:08:11.000000000 -0700
-+++ iputils-good/ping.c	2005-11-27 23:56:00.613161000 -0800
-@@ -61,7 +61,10 @@
- #include "ping_common.h"
- 
- #include <netinet/ip.h>
--#include <netinet/ip_icmp.h>
-+#include <linux/icmp.h>
-+#include <endian.h>
-+#include <asm/byteorder.h>
-+#include <linux/byteorder/swab.h>
- 
- 
- #define	MAXIPLEN	60
diff --git a/net/iputils-tracepath/BUILD b/net/iputils-tracepath/BUILD
index 2761b3f..82bc326 100755
--- a/net/iputils-tracepath/BUILD
+++ b/net/iputils-tracepath/BUILD
@@ -1 +1,2 @@
-  make  TARGETS="tracepath tracepath6 traceroute6"
+make TARGETS="tracepath tracepath6 traceroute6"
+make -C doc man
diff --git a/net/iputils-tracepath/DETAILS b/net/iputils-tracepath/DETAILS
index 8066467..639173f 100755
--- a/net/iputils-tracepath/DETAILS
+++ b/net/iputils-tracepath/DETAILS
@@ -1,14 +1,14 @@
            SPELL=iputils-tracepath
-         VERSION=20020927-2
-          SOURCE=iputils_20020927.orig.tar.gz
-         SOURCE2=iputils_20020927-2.diff.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/iputils
+         VERSION=20071127-1
+          SOURCE=iputils_${VERSION:0:8}.orig.tar.gz
+         SOURCE2=iputils_${VERSION}.diff.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/iputils_${VERSION:0:8}.orig
    SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/i/iputils/$SOURCE
   SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/i/iputils/$SOURCE2
         WEB_SITE=http://packages.debian.org/unstable/net/iputils-tracepath.html
          ENTERED=20030515
-     SOURCE_HASH=sha512:66636d52d1788ccec3b957266116ed8b2b25e523a8438ae98659e1707e0628c7d332f840ab07cae93d121a72d99e028103d2cf0bb1b10648787817374b08e16b
-    SOURCE2_HASH=sha512:390e09a4b105952eca580bb288c4e81d9f17b909267f5cec2dc1c77346ad8c8c77da2f42b3589d92a3abfb7adfebefff81d1d94efbc013d4b3ba612d8674c58d
+     SOURCE_HASH=sha512:7791934d2110e934043d373463f758239d6706a7d87e5dfab2377523830b12aebc24c5f29da7b294df2102f3f0f00589b842eb5c74d86eb29ce1e304d5de7a7d
+    SOURCE2_HASH=sha512:3285ac37dd5645e34e373131dc562fa7d258763c505a37762c7cd5cbb61c2fbdc5548ea728c9a0571afdd13203bbe2a825b09430a0a4c7daccee9c847a8bfd15
       LICENSE[0]=GPL
             DOCS="README"
         KEYWORDS="net"
diff --git a/net/iputils-tracepath/HISTORY b/net/iputils-tracepath/HISTORY
index 6452e40..3550075 100644
--- a/net/iputils-tracepath/HISTORY
+++ b/net/iputils-tracepath/HISTORY
@@ -1,3 +1,8 @@
+2008-02-01 Remko van der Vossen <wich at sourcemage.org>
+        * DETAILS: 20071127-1
+        * PRE_BUILD,iputils-glibc-patch.patch: remove glibc patch
+        * BUILD: also build man pages
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/net/iputils-tracepath/PRE_BUILD b/net/iputils-tracepath/PRE_BUILD
index de81d16..8b80431 100755
--- a/net/iputils-tracepath/PRE_BUILD
+++ b/net/iputils-tracepath/PRE_BUILD
@@ -2,7 +2,4 @@
   cd $SOURCE_DIRECTORY                                    &&
 
   unpack_file 2                                           &&
-  gunzip  -c  $SOURCE_CACHE/$SOURCE2  |  patch  -p1       &&
-
-  # Removes some silly errors.
-  patch -p1 < $SCRIPT_DIRECTORY/iputils-glibc-patch.patch
+  gunzip  -c  $SOURCE_CACHE/$SOURCE2  |  patch  -p1
diff --git a/net/iputils-tracepath/iputils-glibc-patch.patch b/net/iputils-tracepath/iputils-glibc-patch.patch
deleted file mode 100644
index 9ac9478..0000000
--- a/net/iputils-tracepath/iputils-glibc-patch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Not sure why I have to patch this myself, but at least this works for me. -- Seth
-
-diff -Nuar iputils/arping.c iputils-good/arping.c
---- iputils/arping.c	2001-10-05 15:42:47.000000000 -0700
-+++ iputils-good/arping.c	2005-11-27 23:58:16.638290000 -0800
-@@ -19,6 +19,8 @@
- #include <sys/ioctl.h>
- #include <linux/if.h>
- #include <linux/if_arp.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_packet.h>
- #include <sys/uio.h>
- 
- #include <netdb.h>
-diff -Nuar iputils/Makefile iputils-good/Makefile
---- iputils/Makefile	2005-11-28 00:01:25.859844784 -0800
-+++ iputils-good/Makefile	2005-11-27 23:47:41.821964000 -0800
-@@ -10,11 +10,11 @@
- 
- ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
-   ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
--    GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-+#    GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-   endif
- endif
- ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
--  GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
-+#  GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h
- endif
- 
- 
-diff -Nuar iputils/ping6.c iputils-good/ping6.c
---- iputils/ping6.c	2005-11-28 00:01:25.861844314 -0800
-+++ iputils-good/ping6.c	2005-11-27 23:59:12.866096000 -0800
-@@ -71,6 +71,9 @@
- #include <linux/in6.h>
- #include <linux/ipv6.h>
- #include <linux/icmpv6.h>
-+#include <endian.h>
-+#include <asm/byteorder.h>
-+#include <linux/byteorder/swab.h>
- 
- #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0)
- #define BIT_SET(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] |= (1U << ((nr) & 31)); } while(0)
-diff -Nuar iputils/ping.c iputils-good/ping.c
---- iputils/ping.c	2002-09-20 08:08:11.000000000 -0700
-+++ iputils-good/ping.c	2005-11-27 23:56:00.613161000 -0800
-@@ -61,7 +61,10 @@
- #include "ping_common.h"
- 
- #include <netinet/ip.h>
--#include <netinet/ip_icmp.h>
-+#include <linux/icmp.h>
-+#include <endian.h>
-+#include <asm/byteorder.h>
-+#include <linux/byteorder/swab.h>
- 
- 
- #define	MAXIPLEN	60



More information about the SM-Commit mailing list