Apply endian patch by Christopher Friedt (bug #275885). Clean up patch. Respect CFLAGS.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 119 insertions, 34 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index 26251edc9835..fbc4847ced3c 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libnet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.79 2012/04/23 19:56:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.80 2012/04/28 16:59:10 jer Exp $
+
+*libnet-1.0.2a-r4 (28 Apr 2012)
+
+  28 Apr 2012; Jeroen Roovers <jer@gentoo.org> +files/1.0.2a-endian.patch,
+  files/1.0.2a-slot.patch, +libnet-1.0.2a-r4.ebuild:
+  Apply endian patch by Christopher Friedt (bug #275885). Clean up patch.
+  Respect CFLAGS.
 
   23 Apr 2012; Fabian Groffen <grobian@gentoo.org> libnet-1.1.6.ebuild:
   Marked ~{ppc,x86,x64}-macos, bug #410067
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index c3a6712196a1..f33ff2c1e47f 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.0.2a-slot.patch 7696 RMD160 9efca7d4e59ab46eaddb3932c39e86b7ad2bd9ce SHA1 4f4b0d316f8e61eb8d2daf25051036968d5d4594 SHA256 bd1d187bce4f5d618506d0149b469e4208eea0b45bbebec0aa190644be8d016e
+AUX 1.0.2a-endian.patch 393 RMD160 87b4b9f83b679d270404bfbf58dd6d663b7873a8 SHA1 3d0883277d61ee9c55bc4570136ed16025603440 SHA256 7090030460cd78da2dd008f7d10f203ac7361dbb1c9689bc50cd1470f5334a5e
+AUX 1.0.2a-slot.patch 6244 RMD160 1f0f44c932c2f8d66531e249ef710b79f6e7813f SHA1 d59eedccd2cf5a7e066913d5125de6c71c7a7d48 SHA256 114d3cac893c4893992b1e2a30921cfca80d3a852e42c65815d0b62bae5dc66f
 AUX libnet-1.1.5-darwin.patch 595 RMD160 9e8113d58eddb0f456fe74e05a7c2b4dc89ed4e9 SHA1 5188141d86a217f87d0766185ddfc8cae5a6f03b SHA256 dcf3a67d375675544a104f8aedd318cb4ea5d907b3456d9330413ba784845eb8
 AUX libnet-gcc33-fix 563 RMD160 1d153e6ad09f447ab3ebc3568df9e595cc33f133 SHA1 5e29c42bfb18cd3bd55f8700bd0a2886d463c6e3 SHA256 b533c27f07bb27489b0a3941546788447cab6e767b489961ba7fc776ee49ed47
 DIST libnet-1.0.2a.tar.gz 140191 RMD160 43dd2edc31e56b42792727b88d81342dc26d3308 SHA1 804eaf43bb90f93e505d46a9668c914a112bf136 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a
 DIST libnet-1.1.5.tar.gz 1190258 RMD160 46c67e67760c636d7b41a30e13ee2ba97d1f866d SHA1 a2271762a7d6505c1ff6c4c048bf802e643b6790 SHA256 75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d
 DIST libnet-1.1.6.tar.gz 1202970 RMD160 b0549f639abfd21a892b73989f11b9b0716d62bc SHA1 dffff71c325584fdcf99b80567b60f8ad985e34c SHA256 d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a
 EBUILD libnet-1.0.2a-r3.ebuild 1631 RMD160 de464135d17967c5454f9e7f9286db41a2277f62 SHA1 2a48f907e5c916b015969cc937f4caea269e2b46 SHA256 58c6bd04acacaeb7b530bac4db98ce1f9e17487f8efbe066dbbbf1b3e82577ce
+EBUILD libnet-1.0.2a-r4.ebuild 1588 RMD160 73207881c0607e12ff88cd1e829e36f5a6af8396 SHA1 15766ad57b03377a60f28fad5d75e3194a7806c4 SHA256 e91d7d97f7281818c15bf8aedf224977378ac9ca74a4670414864aa25cbdaba9
 EBUILD libnet-1.1.5.ebuild 1044 RMD160 3412fb3966cf04ceaaddd0f21b701ce70be009fd SHA1 9ef3ba1c2c839f4fb1abe118436023b533b61ea6 SHA256 78142c2ad526c8d34d25a9dd2141cc7ce4174bd6ab7bc4a373bec4443f83aa9b
 EBUILD libnet-1.1.6.ebuild 1092 RMD160 1057bfd1eabb6ddef2982124be81e469de590428 SHA1 a8948d03d7c0baed4d9750ffb8bd985fb6feda7f SHA256 f16a804a3641065a4b8e606fc71ce0b4f9532db4be5c0f06be9fa3b1e00830df
-MISC ChangeLog 10296 RMD160 f74842c3ad83449b334b5715bf45935a5e7041e8 SHA1 ffb1d92e0de1390a4466e3701e50ce959b876aae SHA256 c94d4393f056917d665c219263d49fd6b2837161c9331854cbd127b2e2ca05a6
+MISC ChangeLog 10546 RMD160 753673948ed650fce423adacfada0aa95faebbe1 SHA1 30ec6025e157db175be225bb94ca70dfbd7e5642 SHA256 8e9d0ca4281647a16f40ecf73a399b9064ab5467c996c51b8716d69da46bf790
 MISC metadata.xml 1021 RMD160 1e9e28f0dfd9ec6ffff940be53303d9b88b25b9f SHA1 6a1e29dba034a48b8dc54af7fb5bc3cfc1f6f364 SHA256 dde6801b0f8a66cc775c3cb6cadacf0a5c0f024d3535b22b2c787057b5b3e889
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+Vs/oACgkQX3X2B8XHTon5vQCeJuGk9tQ8QI7ktSNx04XNB+hn
-50kAnAh1sTvQr+AFlndFbEqKhDpk0hgM
-=04EF
+iEYEARECAAYFAk+cIeMACgkQVWmRsqeSphMIywCfXZEBETC0k+g+/TJwx4ut972s
+1hwAn1n+0C1ESjIAjwRukmk6AZETOf9R
+=CyH+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnet/files/1.0.2a-endian.patch b/net-libs/libnet/files/1.0.2a-endian.patch
new file mode 100644
index 000000000000..aad0bacb2f2e
--- /dev/null
+++ b/net-libs/libnet/files/1.0.2a-endian.patch
@@ -0,0 +1,20 @@
+--- a/include/libnet.h
++++ b/include/libnet.h
+@@ -32,6 +32,17 @@
+ #ifndef __LIBNET_H
+ #define __LIBNET_H
+ 
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++# define LIBNET_LIL_ENDIAN 1
++#else
++# if __BYTE_ORDER == __BIG_ENDIAN
++#  define LIBNET_BIG_ENDIAN 1
++# else
++#  error unrecognized __BYTE_ORDER
++# endif
++#endif
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch
index fa1e5a6508bc..bcc0d56113f5 100644
--- a/net-libs/libnet/files/1.0.2a-slot.patch
+++ b/net-libs/libnet/files/1.0.2a-slot.patch
@@ -1,6 +1,5 @@
-diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
---- Libnet-1.0.2a.orig/Makefile.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/Makefile.in	2003-08-18 00:10:28.810521400 -0400
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -18,17 +18,17 @@
  LIB_PREFIX  =   @libdir@/
  MAN_PREFIX  =   @MAN_PREFIX@
@@ -63,9 +62,8 @@ diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
 +	version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
  
  # EOF
-diff -ur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
---- Libnet-1.0.2a.orig/configure.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/configure.in	2003-08-17 23:54:35.000000000 -0400
+--- a/configure.in
++++ b/configure.in
 @@ -261,6 +261,6 @@
  AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
      test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
@@ -74,9 +72,8 @@ diff -ur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
 +    libnet-1.0-config, chmod +x libnet-1.0-config)
  
  dnl EOF
-diff -ur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
---- Libnet-1.0.2a.orig/include/libnet.h	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/include/libnet.h	2003-08-18 00:01:38.000000000 -0400
+--- a/include/libnet.h
++++ b/include/libnet.h
 @@ -74,12 +74,12 @@
  #include <errno.h>
  #include <assert.h>
@@ -96,9 +93,8 @@ diff -ur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
  
  #define LIBNET_VERSION  "1.0.2a"
  
-diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
---- Libnet-1.0.2a.orig/libnet-config.in	2003-08-17 23:53:14.000000000 -0400
-+++ Libnet-1.0.2a/libnet-config.in	2003-08-17 23:54:53.000000000 -0400
+--- a/libnet-config.in
++++ b/libnet-config.in
 @@ -9,12 +9,12 @@
  
  libnet_defines="@LIBNET_CONFIG_DEFINES@"
@@ -114,9 +110,8 @@ diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
  Options:
          [--libs]
          [--cflags]
-Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
---- Libnet-1.0.2a/test/Ethernet/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/Ethernet/Makefile.in	2005-01-11 23:32:08.825695008 +0930
+--- a/test/Ethernet/Makefile.in
++++ b/test/Ethernet/Makefile.in
 @@ -10,7 +10,7 @@
  CFLAGS      =   @CFLAGS@
  OBJECTS     =   arp.o tcp.o icmp_mask.o get_address.o poink.o
@@ -126,8 +121,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/ICMP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/ICMP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/ICMP/Makefile.in
++++ b/test/ICMP/Makefile.in
 @@ -15,7 +15,7 @@
  		ping_of_death.o
  
@@ -137,8 +132,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/IP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/IP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/IP/Makefile.in
++++ b/test/IP/Makefile.in
 @@ -10,7 +10,7 @@
  OBJECTS     =   
  
@@ -148,8 +143,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/OSPF/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/OSPF/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/OSPF/Makefile.in
++++ b/test/OSPF/Makefile.in
 @@ -12,7 +12,7 @@
  		ospf_request.o   \
  
@@ -159,8 +154,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/Random/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/Random/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/Random/Makefile.in
++++ b/test/Random/Makefile.in
 @@ -9,7 +9,7 @@
  CFLAGS      =   @CFLAGS@
  OBJECTS     =   prand_trials.o
@@ -170,8 +165,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/TCP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/TCP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+--- a/test/TCP/Makefile.in
++++ b/test/TCP/Makefile.in
 @@ -13,7 +13,7 @@
                  tcp+data+ipopt.o
  
@@ -181,8 +176,8 @@ Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
  
  .c.o:
  	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
---- Libnet-1.0.2a/test/UDP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
-+++ Libnet-1.0.2a/test/UDP/Makefile.in	2005-01-11 23:32:08.827694704 +0930
+--- a/test/UDP/Makefile.in
++++ b/test/UDP/Makefile.in
 @@ -11,7 +11,7 @@
                  udp+data.o
  
diff --git a/net-libs/libnet/libnet-1.0.2a-r4.ebuild b/net-libs/libnet/libnet-1.0.2a-r4.ebuild
new file mode 100644
index 000000000000..eaf12e800912
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r4.ebuild,v 1.1 2012/04/28 16:59:10 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/libnet-gcc33-fix \
+		"${FILESDIR}"/${PV}-slot.patch \
+		"${FILESDIR}"/${PV}-endian.patch
+
+	cd "${S}"
+	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+
+	cd "${S}"/include
+	ln -s libnet.h libnet-${SLOT}.h
+
+	cd libnet
+	for f in *.h ; do
+		ln -s ${f} ${f/-/-${SLOT}-} || die "linking ${f}"
+	done
+
+	cd "${S}"/doc
+	ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
+
+	cd "${S}"
+	sed -i configure.in -e '/CCOPTS=/d;/CFLAGS=/s|.*|:|' || die
+
+	eautoconf
+}
+
+src_install() {
+	default
+	doman "${D}"/usr/man/man3/libnet-1.0.3
+	rm -r "${D}"/usr/man
+
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
+	newdoc README README.1st
+	docinto example ; dodoc example/libnet*
+	docinto Ancillary ; dodoc doc/Ancillary/*
+}
+
+pkg_postinst(){
+	elog "libnet ${SLOT} is deprecated !"
+	elog "config script: libnet-${SLOT}-config"
+	elog "manpage: libnet-${SLOT}"
+	elog "library: libnet-${SLOT}.a"
+	elog "include: libnet-${SLOT}.h"
+}