* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/
@ 2021-03-15 21:09 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-03-15 21:09 UTC (permalink / raw
To: gentoo-commits
commit: ebdc3396c4d25c2adbb919152b2712160427535a
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jan 2 17:49:16 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:08:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebdc3396
net-libs/libnet: add patch to support musl
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/14219
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libnet/files/libnet-1.2-int64_t.patch | 15 +++++++++++++++
net-libs/libnet/libnet-1.2.ebuild | 4 ++++
2 files changed, 19 insertions(+)
diff --git a/net-libs/libnet/files/libnet-1.2-int64_t.patch b/net-libs/libnet/files/libnet-1.2-int64_t.patch
new file mode 100644
index 00000000000..b0b968fc332
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-int64_t.patch
@@ -0,0 +1,15 @@
+--- a/include/libnet/libnet-structures.h
++++ b/include/libnet/libnet-structures.h
+@@ -49,9 +49,9 @@ struct libnet_port_list_chain
+ /* libnet statistics structure */
+ struct libnet_stats
+ {
+- __int64_t packets_sent; /* packets sent */
+- __int64_t packet_errors; /* packets errors */
+- __int64_t bytes_written; /* bytes written */
++ int64_t packets_sent; /* packets sent */
++ int64_t packet_errors; /* packets errors */
++ int64_t bytes_written; /* bytes written */
+ };
+
+
diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild
index 7e47a083806..7c9c1dba2b0 100644
--- a/net-libs/libnet/libnet-1.2.ebuild
+++ b/net-libs/libnet/libnet-1.2.ebuild
@@ -16,6 +16,10 @@ DOCS=(
ChangeLog.md README.md doc/MIGRATION.md
)
+# This patch is taken from master branch in mainstream commit a1659e2. It is
+# necessary in order to support musl libc.
+PATCHES=( "${FILESDIR}/${P}-int64_t.patch" )
+
src_configure() {
econf $(use_enable static-libs static)
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/
@ 2020-01-27 0:54 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2020-01-27 0:54 UTC (permalink / raw
To: gentoo-commits
commit: ecd205fb78fa52836a18d835c1468e0afd03b38d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 00:53:03 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 00:54:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd205fb
net-libs/libnet: Old
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-libs/libnet/Manifest | 1 -
net-libs/libnet/files/libnet-1.1.6-musl.patch | 29 -----------
net-libs/libnet/files/libnet-1.2-_SOURCE.patch | 20 --------
net-libs/libnet/files/libnet-1.2-rc.patch | 11 -----
net-libs/libnet/files/libnet-1.2-sizeof.patch | 11 -----
net-libs/libnet/files/libnet-1.2-socklen_t.patch | 11 -----
net-libs/libnet/libnet-1.0.2a-r5.ebuild | 63 ------------------------
net-libs/libnet/libnet-1.0.2a-r6.ebuild | 58 ----------------------
net-libs/libnet/libnet-1.2_rc3-r1.ebuild | 50 -------------------
9 files changed, 254 deletions(-)
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 0392bfec5f9..b64b987126b 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,3 +1,2 @@
DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
-DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
diff --git a/net-libs/libnet/files/libnet-1.1.6-musl.patch b/net-libs/libnet/files/libnet-1.1.6-musl.patch
deleted file mode 100644
index 238fb8acbef..00000000000
--- a/net-libs/libnet/files/libnet-1.1.6-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/libnet_link_linux.c
-+++ b/src/libnet_link_linux.c
-@@ -30,26 +30,15 @@
- #include <sys/time.h>
-
- #include <net/if.h>
--#if (__GLIBC__)
- #include <netinet/if_ether.h>
- #include <net/if_arp.h>
--#else
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
-
- #if (HAVE_PACKET_SOCKET)
- #ifndef SOL_PACKET
- #define SOL_PACKET 263
- #endif /* SOL_PACKET */
--#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
- #include <netpacket/packet.h>
- #include <net/ethernet.h> /* the L2 protocols */
--#else
--#include <asm/types.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h> /* The L2 protocols */
--#endif
- #endif /* HAVE_PACKET_SOCKET */
-
- #include "../include/libnet.h"
diff --git a/net-libs/libnet/files/libnet-1.2-_SOURCE.patch b/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
deleted file mode 100644
index d9c74f40e30..00000000000
--- a/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,14 +157,14 @@
- case "$target_os" in
-
- *linux*)
-- AC_DEFINE(_BSD_SOURCE, 1,
-+ AC_DEFINE(_DEFAULT_SOURCE, 1,
- [Define as necessary to "unhide" header symbols.])
-- AC_DEFINE(__BSD_SOURCE, 1,
-+ AC_DEFINE(__DEFAULT_SOURCE, 1,
- [Define as necessary to "unhide" header symbols.])
- AC_DEFINE(__FAVOR_BSD, 1,
- [Define if we should favor the BSD APIs when possible in Linux.])
-
-- LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
-+ LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
- AC_CHECK_HEADERS(net/ethernet.h, \
- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
- ;;
diff --git a/net-libs/libnet/files/libnet-1.2-rc.patch b/net-libs/libnet/files/libnet-1.2-rc.patch
deleted file mode 100644
index b9e44a3491c..00000000000
--- a/net-libs/libnet/files/libnet-1.2-rc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- dnl
- dnl Process this file with autoconf to produce a configure script.
-
--AC_INIT([libnet],[1.2-rc3])
-+AC_INIT([libnet],[1.2])
- AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
- AC_CANONICAL_TARGET
- AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
diff --git a/net-libs/libnet/files/libnet-1.2-sizeof.patch b/net-libs/libnet/files/libnet-1.2-sizeof.patch
deleted file mode 100644
index 603224267fd..00000000000
--- a/net-libs/libnet/files/libnet-1.2-sizeof.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sample/sebek.c
-+++ b/sample/sebek.c
-@@ -167,7 +167,7 @@
-
- if (payload_flag)
- {
-- memset(cmd, 0, sizeof(cmd));
-+ memset(cmd, 0, length);
- memcpy(cmd, payload, (payload_s < 12 ? payload_s : 12));
- length = payload_s;
- }
diff --git a/net-libs/libnet/files/libnet-1.2-socklen_t.patch b/net-libs/libnet/files/libnet-1.2-socklen_t.patch
deleted file mode 100644
index bce36704477..00000000000
--- a/net-libs/libnet/files/libnet-1.2-socklen_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libnet_raw.c
-+++ b/src/libnet_raw.c
-@@ -77,7 +77,7 @@
- #else
- BOOL n;
- #endif
-- int len;
-+ socklen_t len;
-
- #ifdef SO_SNDBUF
-
diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
deleted file mode 100644
index 4aca81dda4a..00000000000
--- a/net-libs/libnet/libnet-1.0.2a-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils toolchain-funcs
-
-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="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/Libnet-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch \
- "${FILESDIR}"/${PN}-1.0.2a-slot.patch
-
- use arm && epatch "${FILESDIR}"/${PN}-1.0.2a-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
-
- tc-export AR RANLIB
-}
-
-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"
-}
diff --git a/net-libs/libnet/libnet-1.0.2a-r6.ebuild b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
deleted file mode 100644
index 850469f7609..00000000000
--- a/net-libs/libnet/libnet-1.0.2a-r6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
- "${FILESDIR}"/${PN}-1.0.2a-slot.patch
- "${FILESDIR}"/${PN}-1.0.2a-endian.patch
- "${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
- "${FILESDIR}"/${PN}-1.0.2a-funroll.patch
-
-)
-S=${WORKDIR}/Libnet-${PV}
-
-src_prepare() {
- default
-
- 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
- done
-
- cd "${S}"/doc
- ln -s libnet.3 libnet-${SLOT}.3 || die
-
- cd "${S}"
-
- eautoconf
-
- tc-export AR RANLIB
-}
-
-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/*
-}
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
deleted file mode 100644
index f5eef85a2c3..00000000000
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://libnet-dev.sourceforge.net/ https://github.com/sam-github/libnet"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DOCS=(
- README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
- doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-S=${WORKDIR}/${P/_/-}
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.6-musl.patch
- "${FILESDIR}"/${PN}-1.2-_SOURCE.patch
- "${FILESDIR}"/${PN}-1.2-rc.patch
- "${FILESDIR}"/${PN}-1.2-sizeof.patch
- "${FILESDIR}"/${PN}-1.2-socklen_t.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if use doc ; then
- docinto html
- dodoc -r doc/html/*
- docinto sample
- dodoc sample/*.[ch]
- fi
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/
@ 2019-10-28 9:49 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-10-28 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 0f97f90369c880c95a869a795a885674bca3a778
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 09:48:39 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 09:49:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f97f903
net-libs/libnet: EAPI=7, fix src_test()
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-libs/libnet/files/libnet-1.0.2a-test.patch | 54 ++++++++++++++++++++++
net-libs/libnet/libnet-1.0.2a-r7.ebuild | 63 ++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/net-libs/libnet/files/libnet-1.0.2a-test.patch b/net-libs/libnet/files/libnet-1.0.2a-test.patch
new file mode 100644
index 00000000000..8bbb2ac45d1
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-test.patch
@@ -0,0 +1,54 @@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -9,31 +9,31 @@
+ all: test
+
+ test:
+- if ! test -e ../lib/libnet.a; then \
+- cd .. && make; \
++ if ! test -e ../lib/libnet-1.0.a; then \
++ cd .. && $(MAKE); \
+ fi
+- cd Random; make all
+- cd ICMP; make all
+- cd UDP; make all
+- cd TCP; make all
+- cd Ethernet; make all
+- cd OSPF; make all
++ cd Random; $(MAKE) all
++ cd ICMP; $(MAKE) all
++ cd UDP; $(MAKE) all
++ cd TCP; $(MAKE) all
++ cd Ethernet; $(MAKE) all
++ cd OSPF; $(MAKE) all
+
+ clean:
+- cd Random; make clean
+- cd ICMP; make clean
+- cd UDP; make clean
+- cd TCP; make clean
+- cd Ethernet; make clean
+- cd OSPF; make clean
++ cd Random; $(MAKE) clean
++ cd ICMP; $(MAKE) clean
++ cd UDP; $(MAKE) clean
++ cd TCP; $(MAKE) clean
++ cd Ethernet; $(MAKE) clean
++ cd OSPF; $(MAKE) clean
+
+ distclean: clean
+- cd TCP; make distclean
+- cd UDP; make distclean
+- cd ICMP; make distclean
+- cd Random; make distclean
+- cd Ethernet; make distclean
+- cd OSPF; make distclean
++ cd TCP; $(MAKE) distclean
++ cd UDP; $(MAKE) distclean
++ cd ICMP; $(MAKE) distclean
++ cd Random; $(MAKE) distclean
++ cd Ethernet; $(MAKE) distclean
++ cd OSPF; $(MAKE) distclean
+ rm -f Makefile
+
+ # EOF
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
new file mode 100644
index 00000000000..5419190c2e1
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
+ "${FILESDIR}"/${PN}-1.0.2a-slot.patch
+ "${FILESDIR}"/${PN}-1.0.2a-endian.patch
+ "${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
+ "${FILESDIR}"/${PN}-1.0.2a-funroll.patch
+ "${FILESDIR}"/${PN}-1.0.2a-test.patch
+
+)
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+ default
+
+ 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
+ done
+
+ cd "${S}"/doc
+ ln -s libnet.3 libnet-${SLOT}.3 || die
+
+ cd "${S}"
+
+ eautoconf
+
+ tc-export AR RANLIB
+}
+
+src_test() {
+ emake -C test
+}
+
+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/*
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/
@ 2017-12-02 12:00 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-12-02 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 16876752e8982ebdef41486aaf9d1d7c9f78fa65
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 11:25:46 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 11:59:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16876752
net-libs/libnet: Old.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-libs/libnet/Manifest | 5 +--
net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch | 20 ----------
net-libs/libnet/libnet-1.1.6-r1.ebuild | 50 ------------------------
net-libs/libnet/libnet-1.1.6.ebuild | 41 -------------------
net-libs/libnet/libnet-1.2_rc3.ebuild | 44 ---------------------
5 files changed, 2 insertions(+), 158 deletions(-)
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 9cbc0ae64c3..fba13d83980 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,3 +1,2 @@
-DIST libnet-1.0.2a.tar.gz 140191 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95 WHIRLPOOL 9b3748fe93191643a01cab0ce76283aa11079960efca5daaf52d7a0aa830c3791a200711c9d4b4634739328282bbc4f73b24a15406b4bf5353838ef24c19afcc
-DIST libnet-1.1.6.tar.gz 1202970 SHA256 d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a SHA512 a67e502b0e6957ca590e47cb50b0472dd83d622d84c62818d665d771616df91b5a8fa8fcf1040d13b7860aaabaf338152ef40f66ab97c3fc9502edb08cea0bb6 WHIRLPOOL eb0596d8d6d1b0434ce8d1ec7069826e326effa5ad215e607dc7afc495ae0bdee443f6661deb5b54c8564abd8fa0ccbf4f509726d3caa81767d80f4f5079b379
-DIST libnet-1.2-rc3.tar.gz 676205 SHA256 72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d WHIRLPOOL 617b01b3e0ec150b89fd0a5160a84704e82a14c584735d87bca6bf7f0847e461d99e72fe2d632761af229c4379881b0ddf270171071052cd288a2ab54c3d3a02
+DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
+DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
diff --git a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch b/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
deleted file mode 100644
index 25ddbc7b110..00000000000
--- a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -157,14 +157,14 @@
- case "$target_os" in
-
- *linux*)
-- AC_DEFINE(_BSD_SOURCE, 1,
-+ AC_DEFINE(_DEFAULT_SOURCE, 1,
- [Define as necessary to "unhide" header symbols.])
-- AC_DEFINE(__BSD_SOURCE, 1,
-+ AC_DEFINE(__DEFAULT_SOURCE, 1,
- [Define as necessary to "unhide" header symbols.])
- AC_DEFINE(__FAVOR_BSD, 1,
- [Define if we should favor the BSD APIs when possible in Linux.])
-
-- LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
-+ LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
- AC_CHECK_HEADERS(net/ethernet.h, \
- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
- ;;
diff --git a/net-libs/libnet/libnet-1.1.6-r1.ebuild b/net-libs/libnet/libnet-1.1.6-r1.ebuild
deleted file mode 100644
index 8311759829d..00000000000
--- a/net-libs/libnet/libnet-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-
-DOCS=(
- README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
- doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.6-_SOURCE.patch
- "${FILESDIR}"/${PN}-1.1.6-musl.patch
- "${FILESDIR}"/${PN}-1.2-sizeof.patch
-)
-
-src_prepare() {
- default
-
- mv configure{.in,.ac} || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if use doc ; then
- dodoc -r doc/html
-
- docinto sample
- dodoc sample/*.[ch]
- fi
-
- prune_libtool_files
-}
diff --git a/net-libs/libnet/libnet-1.1.6.ebuild b/net-libs/libnet/libnet-1.1.6.ebuild
deleted file mode 100644
index f73669dd3a7..00000000000
--- a/net-libs/libnet/libnet-1.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-RDEPEND=""
-
-DOCS=(
- README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
- doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if use doc ; then
- dohtml -r doc/html/*
- docinto sample
- dodoc sample/*.[ch]
- fi
-
- if ! use static-libs; then
- rm "${ED}"/usr/lib*/libnet.la || die
- fi
-}
diff --git a/net-libs/libnet/libnet-1.2_rc3.ebuild b/net-libs/libnet/libnet-1.2_rc3.ebuild
deleted file mode 100644
index c541794f8e7..00000000000
--- a/net-libs/libnet/libnet-1.2_rc3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-RDEPEND=""
-
-DOCS=(
- README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
- doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2-rc.patch
- eautoreconf
-}
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if use doc ; then
- dohtml -r doc/html/*
- docinto sample
- dodoc sample/*.[ch]
- fi
-
- use static-libs || prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/
@ 2016-08-08 13:10 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-08-08 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 3dadd237dced7b2750ddcebf7921a1011170e5f0
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 13:09:23 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 13:10:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dadd237
net-libs/libnet: Fix building against sys-libs/musl by Petr Vaněk (bug #590738).
Package-Manager: portage-2.3.0
net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch | 20 ++++++++++
net-libs/libnet/files/libnet-1.1.6-musl.patch | 29 ++++++++++++++
net-libs/libnet/files/libnet-1.2-_SOURCE.patch | 20 ++++++++++
net-libs/libnet/files/libnet-1.2-sizeof.patch | 11 +++++
net-libs/libnet/files/libnet-1.2-socklen_t.patch | 11 +++++
net-libs/libnet/libnet-1.1.6-r1.ebuild | 51 ++++++++++++++++++++++++
net-libs/libnet/libnet-1.2_rc3-r1.ebuild | 51 ++++++++++++++++++++++++
7 files changed, 193 insertions(+)
diff --git a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch b/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
new file mode 100644
index 0000000..25ddbc7
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -157,14 +157,14 @@
+ case "$target_os" in
+
+ *linux*)
+- AC_DEFINE(_BSD_SOURCE, 1,
++ AC_DEFINE(_DEFAULT_SOURCE, 1,
+ [Define as necessary to "unhide" header symbols.])
+- AC_DEFINE(__BSD_SOURCE, 1,
++ AC_DEFINE(__DEFAULT_SOURCE, 1,
+ [Define as necessary to "unhide" header symbols.])
+ AC_DEFINE(__FAVOR_BSD, 1,
+ [Define if we should favor the BSD APIs when possible in Linux.])
+
+- LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
++ LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
+ AC_CHECK_HEADERS(net/ethernet.h, \
+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
+ ;;
diff --git a/net-libs/libnet/files/libnet-1.1.6-musl.patch b/net-libs/libnet/files/libnet-1.1.6-musl.patch
new file mode 100644
index 0000000..238fb8a
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.1.6-musl.patch
@@ -0,0 +1,29 @@
+--- a/src/libnet_link_linux.c
++++ b/src/libnet_link_linux.c
+@@ -30,26 +30,15 @@
+ #include <sys/time.h>
+
+ #include <net/if.h>
+-#if (__GLIBC__)
+ #include <netinet/if_ether.h>
+ #include <net/if_arp.h>
+-#else
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
+-#endif
+
+ #if (HAVE_PACKET_SOCKET)
+ #ifndef SOL_PACKET
+ #define SOL_PACKET 263
+ #endif /* SOL_PACKET */
+-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
+ #include <netpacket/packet.h>
+ #include <net/ethernet.h> /* the L2 protocols */
+-#else
+-#include <asm/types.h>
+-#include <linux/if_packet.h>
+-#include <linux/if_ether.h> /* The L2 protocols */
+-#endif
+ #endif /* HAVE_PACKET_SOCKET */
+
+ #include "../include/libnet.h"
diff --git a/net-libs/libnet/files/libnet-1.2-_SOURCE.patch b/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
new file mode 100644
index 0000000..d9c74f4
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-_SOURCE.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,14 +157,14 @@
+ case "$target_os" in
+
+ *linux*)
+- AC_DEFINE(_BSD_SOURCE, 1,
++ AC_DEFINE(_DEFAULT_SOURCE, 1,
+ [Define as necessary to "unhide" header symbols.])
+- AC_DEFINE(__BSD_SOURCE, 1,
++ AC_DEFINE(__DEFAULT_SOURCE, 1,
+ [Define as necessary to "unhide" header symbols.])
+ AC_DEFINE(__FAVOR_BSD, 1,
+ [Define if we should favor the BSD APIs when possible in Linux.])
+
+- LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
++ LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
+ AC_CHECK_HEADERS(net/ethernet.h, \
+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
+ ;;
diff --git a/net-libs/libnet/files/libnet-1.2-sizeof.patch b/net-libs/libnet/files/libnet-1.2-sizeof.patch
new file mode 100644
index 0000000..e06dbb5
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-sizeof.patch
@@ -0,0 +1,11 @@
+--- a/sample/sebek.c
++++ b/sample/sebek.c
+@@ -167,7 +167,7 @@
+
+ if (payload_flag)
+ {
+- memset(cmd, 0, sizeof(cmd));
++ memset(cmd, 0, sizeof(*cmd));
+ memcpy(cmd, payload, (payload_s < 12 ? payload_s : 12));
+ length = payload_s;
+ }
diff --git a/net-libs/libnet/files/libnet-1.2-socklen_t.patch b/net-libs/libnet/files/libnet-1.2-socklen_t.patch
new file mode 100644
index 0000000..bce3670
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-socklen_t.patch
@@ -0,0 +1,11 @@
+--- a/src/libnet_raw.c
++++ b/src/libnet_raw.c
+@@ -77,7 +77,7 @@
+ #else
+ BOOL n;
+ #endif
+- int len;
++ socklen_t len;
+
+ #ifdef SO_SNDBUF
+
diff --git a/net-libs/libnet/libnet-1.1.6-r1.ebuild b/net-libs/libnet/libnet-1.1.6-r1.ebuild
new file mode 100644
index 0000000..0144fd4
--- /dev/null
+++ b/net-libs/libnet/libnet-1.1.6-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://libnet-dev.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DEPEND="sys-devel/autoconf"
+
+DOCS=(
+ README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
+ doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.6-_SOURCE.patch
+ "${FILESDIR}"/${PN}-1.1.6-musl.patch
+ "${FILESDIR}"/${PN}-1.2-sizeof.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure{.in,.ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dodoc -r doc/html
+
+ docinto sample
+ dodoc sample/*.[ch]
+ fi
+
+ prune_libtool_files
+}
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
new file mode 100644
index 0000000..305d02d
--- /dev/null
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://libnet-dev.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DOCS=(
+ README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
+ doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+
+S=${WORKDIR}/${P/_/-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.6-musl.patch
+ "${FILESDIR}"/${PN}-1.2-_SOURCE.patch
+ "${FILESDIR}"/${PN}-1.2-rc.patch
+ "${FILESDIR}"/${PN}-1.2-sizeof.patch
+ "${FILESDIR}"/${PN}-1.2-socklen_t.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ docinto html
+ dodoc -r doc/html/*
+ docinto sample
+ dodoc sample/*.[ch]
+ fi
+
+ prune_libtool_files
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-15 21:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-15 21:09 [gentoo-commits] repo/gentoo:master commit in: net-libs/libnet/, net-libs/libnet/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 0:54 Jeroen Roovers
2019-10-28 9:49 Jeroen Roovers
2017-12-02 12:00 Jeroen Roovers
2016-08-08 13:10 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox