From 197e56897b75072737ecbe88633c9821c1c28867 Mon Sep 17 00:00:00 2001 From: Gabriel Kerneis Date: Tue, 12 Oct 2010 07:11:16 +0000 Subject: [PATCH] [package] babel: upgrade to version 1.0.2 This version works around a gcc bug that would cause assertion failures on MIPS. Other than that, there are no user-visible changes. Signed-off-by: Gabriel Kerneis SVN-Revision: 23408 --- net/babel/Makefile | 6 +++--- net/babel/patches/001-buggy-packed.patch | 22 ---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 net/babel/patches/001-buggy-packed.patch diff --git a/net/babel/Makefile b/net/babel/Makefile index 497f1487d4..8944b7330c 100644 --- a/net/babel/Makefile +++ b/net/babel/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=1.0.1 -PKG_RELEASE:=5 +PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=b46b7f62bf8c213d5faffbe81c424e76 +PKG_MD5SUM:=5ac316cb3311a36ec43622bebb668f7a include $(INCLUDE_DIR)/package.mk diff --git a/net/babel/patches/001-buggy-packed.patch b/net/babel/patches/001-buggy-packed.patch deleted file mode 100644 index f18073117e..0000000000 --- a/net/babel/patches/001-buggy-packed.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fri Sep 24 16:25:40 CEST 2010 Juliusz Chroboczek - * Don't use __attribute__((packed)), it is buggy. -diff -rN -u old-babeld/util.h new-babeld/util.h ---- old-babeld/util.h 2010-10-08 15:41:20.000000000 +0200 -+++ new-babeld/util.h 2010-10-08 15:41:20.000000000 +0200 -@@ -20,7 +20,15 @@ - THE SOFTWARE. - */ - --#if defined __GNUC__ -+#if defined(i386) || defined(__mc68020__) || defined(__x86_64__) -+#define DO_NTOHS(_d, _s) do { _d = ntohs(*(unsigned short*)(_s)); } while(0) -+#define DO_NTOHL(_d, _s) do { _d = ntohl(*(unsigned*)(_s)); } while(0) -+#define DO_HTONS(_d, _s) do { *(unsigned short*)(_d) = htons(_s); } while(0) -+#define DO_HTONL(_d, _s) do { *(unsigned*)(_d) = htonl(_s); } while(0) -+/* Some versions of gcc seem to be buggy, and ignore the packed attribute. -+ Disable this code until the issue is clarified. */ -+/* #elif defined __GNUC__*/ -+#elif 0 - struct __us { unsigned short x __attribute__((packed)); }; - #define DO_NTOHS(_d, _s) \ - do { _d = ntohs(((const struct __us*)(_s))->x); } while(0) -- 2.30.2