From 4cd2370bed609c118b6edfde5d3f116e5c35b897 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Dec 2017 16:17:22 +0000 Subject: gentoo resync : 03.12.2017 --- net-libs/libnet/Manifest | 20 +-- net-libs/libnet/files/1.0.2a-endian.patch | 20 --- net-libs/libnet/files/1.0.2a-slot.patch | 189 --------------------- net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch | 11 ++ net-libs/libnet/files/libnet-1.0.2a-endian.patch | 20 +++ net-libs/libnet/files/libnet-1.0.2a-funroll.patch | 12 ++ .../libnet/files/libnet-1.0.2a-gcc33-fix.patch | 13 ++ net-libs/libnet/files/libnet-1.0.2a-slot.patch | 189 +++++++++++++++++++++ net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch | 20 --- net-libs/libnet/files/libnet-gcc33-fix | 13 -- net-libs/libnet/libnet-1.0.2a-r5.ebuild | 8 +- net-libs/libnet/libnet-1.0.2a-r6.ebuild | 58 +++++++ 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 ----- 15 files changed, 316 insertions(+), 392 deletions(-) delete mode 100644 net-libs/libnet/files/1.0.2a-endian.patch delete mode 100644 net-libs/libnet/files/1.0.2a-slot.patch create mode 100644 net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch create mode 100644 net-libs/libnet/files/libnet-1.0.2a-endian.patch create mode 100644 net-libs/libnet/files/libnet-1.0.2a-funroll.patch create mode 100644 net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch create mode 100644 net-libs/libnet/files/libnet-1.0.2a-slot.patch delete mode 100644 net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch delete mode 100644 net-libs/libnet/files/libnet-gcc33-fix create mode 100644 net-libs/libnet/libnet-1.0.2a-r6.ebuild delete mode 100644 net-libs/libnet/libnet-1.1.6-r1.ebuild delete mode 100644 net-libs/libnet/libnet-1.1.6.ebuild delete mode 100644 net-libs/libnet/libnet-1.2_rc3.ebuild (limited to 'net-libs/libnet') diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest index 377ea794bfe3..b3e78f0b4da6 100644 --- a/net-libs/libnet/Manifest +++ b/net-libs/libnet/Manifest @@ -1,18 +1,16 @@ -AUX 1.0.2a-endian.patch 393 BLAKE2B a9dd6ce1763fb109b7f36d0cdf2c36297c0b19b1e321ed9bdf6591a74485fbf68baa8a0c06fc55d5a4a1464c8611e15dc2a4c844f39420f4e1d5d5e337248a45 SHA512 f21cc84faa2336705fb5dc7a723d1657cb2930636b42fac13539a8280b177b3e5480738063f252024ddad17d2ba156f470d0e965f3ef39c8b3aee2fcac90c123 -AUX 1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5 -AUX libnet-1.1.6-_SOURCE.patch 735 BLAKE2B 1ea5633147c43be1beb247078c2fed27be6b5736fb1d59a789bbf93e7c1bd72185977bd66f2f4da7b6e28eae59e79c6f05e1b99f1d70b0bd2d01075f32dbbc0e SHA512 e8385c169e00df9dc146b54c6e836f3c364d219c1f041c4967505a4d77bd106437c54286f01adb0c74dc06a2dfffa19bdeb71fad457661cab0a7c0d8f717605f +AUX libnet-1.0.2a-_SOURCE.patch 431 BLAKE2B 76343597f15001e460c422cbc093e6521a449fb3958f1e000b2cf53a9bd3684a19fa8bdb1b58ba2bde526202e773318f8df5e8a8f2e86d688ccdab48e8a927bf SHA512 a820791a2fd020065289051284e158015727b6ff696405513a4118f4fd96a0485a1bcd877dabeec6d7240a5cbc0f566fc567e4b50dbd7bdf7e732dccedab30e1 +AUX libnet-1.0.2a-endian.patch 393 BLAKE2B a9dd6ce1763fb109b7f36d0cdf2c36297c0b19b1e321ed9bdf6591a74485fbf68baa8a0c06fc55d5a4a1464c8611e15dc2a4c844f39420f4e1d5d5e337248a45 SHA512 f21cc84faa2336705fb5dc7a723d1657cb2930636b42fac13539a8280b177b3e5480738063f252024ddad17d2ba156f470d0e965f3ef39c8b3aee2fcac90c123 +AUX libnet-1.0.2a-funroll.patch 232 BLAKE2B dc4eea13f830b03e02cab52d594dbd0322c30b2f7189ad35ebc6bd6c703f35ff5e6ae9f69ef35fc57cf224d56d09f07b71287be3c429421da7da5bb6ccf4e939 SHA512 c00749b3a17f08ba000ff26206a46a1b49f53e0a04b49df2151124e95b789854d8a3df563ad13553b35b4c683dca2be53905380a0f1d8eedb71c86d18b26127d +AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf545d0fd103e9d088db147bcd5042c11827b918e8560792665982548033e439cd0a5af1938415c2852bd335e0f6f283f6 SHA512 ca4913145ffaf42ef1d267558ac00c096d1561a6dddf05b11f229aef969cc1601492168ae238d5d46b7015722822f9600018bc8a7cc344a4176e4d6c6e0c363f +AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5 AUX libnet-1.1.6-musl.patch 686 BLAKE2B 08d509fbb0dc960aa8e3fa622e958fe9b4fbadaf8cd47896c02eb90bcc897eb1a3b7699350f7a64f63a529efc325573bd5b5d730f7129ea601f6338db2d09fe3 SHA512 23bbf5e87b704b2d4cf3f6da308b29d840950fde67eb67294ed44bc18eb327b4a2bcd04218dbd1a27a2445b3df7a98af72b1d5bd1afc83cb448a9e8f403aec01 AUX libnet-1.2-_SOURCE.patch 735 BLAKE2B af32a0eb7f6dac2fb909785f7ef95bd98d0bd92f48759ab4673d2c3f10b894bd0732fe82fa1fd60ce897c0c4b0eaefc8ff57b3cd13ec632f89ebd00376e5fee1 SHA512 698138d6d39984090fb906cc0201b720c399f0a55dd06cc8857159f0e045bd980c195876ef2662fa4e54d6dfd12e1a106e6c829dc201226c97296c2d24bc2a59 AUX libnet-1.2-rc.patch 333 BLAKE2B 5e3d0803e985f2ec49f11236b8fdc59742aad401448e921c3c5180354f52e4bd9be28804c656ede929c107c7577c48241277642a5650e0647b0842194afecca0 SHA512 144796cbcf550982a523df46763a60ee5261c8fd80adc674c0a2075b1003623785a1c5589e6ff53a5472e43f3f16d859e71ba6fa98aaaabc767ceb4805676bcd AUX libnet-1.2-sizeof.patch 239 BLAKE2B 141f8d9c32d351e5f30eedfe0b92b0d9cb7ad0ddbdc811f4aafa1e482925e0735b7d8722aa513b62ec2e79d457f9b72fbd3d1188342666b331cd1e6d9c7bc456 SHA512 ef1967dc7fc18b5573dcb617a855b3401ca843936a690f26827effb61dc8b30c5efe9b3a5f3cfae448a134c57517cbf14e8bca4cb82629c65b61dccea9ff0bae AUX libnet-1.2-socklen_t.patch 145 BLAKE2B 35a13516984af9f460c0778a25e205c79e7152178549203f070676dc69ae20b9c99ada7a0194ec898beaa45b403cd584a458079b1d2c458b0b1923f9628d7d8c SHA512 31e7dbee2e6d747a69d86f9cfba43d1f591d97f2868b14c9fa16884f5d1650a7602ca10e875afe5779477d9358db6121fd66371fe183a865860376fb809aef97 -AUX libnet-gcc33-fix 563 BLAKE2B 591b93e07d72303f45653481baaf710d1aa683dd070ee38bf50900675138cde312290b9c9cccd26e1a3a995849a703deffc2faaa07ee9c6cb1611359b54a64a8 SHA512 39ebf252e994ff5dc0701d7a7b6162f595157c8f48a85f6624cc3b20235b01872821d2df8de7dceac7db0df79f39e68201c0607e184f40f4d63b7525a5c3e869 -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 -EBUILD libnet-1.0.2a-r5.ebuild 1531 BLAKE2B 7fa2afc9fa5c38da348341dd561b0128dbcf0735e4fac29903fb14cc10f718a37fdd3bd34a6532ff7c8b01b021e50afe6df93b8432629edadbaf4e4a4c89ba76 SHA512 b5135c8a839a8525217f7faceeda87277212355b212eb328cc40efe87ea50c87e5c210a9edbb53243376b804b43456bcbf0c307c4cd0732f692861420c4f2ebc -EBUILD libnet-1.1.6-r1.ebuild 1114 BLAKE2B 4466591b3afc7513c8cb387ace62fef7c9a2976e703fe4e8d0b7353fe53cd3e3b518d2c5aed37b24ab0e46cca677a35a061bc90fbb2f47e0826f1a01a6f112dc SHA512 a77594e6295082ca6f2e5b276246487be09a7f3a24c1067e2d6d73f7472465cbf2f0b17ed6bf9ba98dbaaac497a21b097104ed8ded5fce59f1d8fbe7157aff1e -EBUILD libnet-1.1.6.ebuild 981 BLAKE2B 4fdbe43a1111de35ea0e506c7fc9a71941b92e710d89c0672ccb94c7a831d1080e5a53e3195a0888a51bf10f6523efac4e31a08d0bf7d4a6f9bf8bc7c625e41d SHA512 8ff5ae9af523cfeb2edd31427ef14bdac5358a6ba104bf53b8328483bdac37bf86ebd0d96901b436860e1900da4fa7c737692d6e7a14e21b3d0f4e3b60a5ad0c +DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95 +DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d +EBUILD libnet-1.0.2a-r5.ebuild 1557 BLAKE2B 2c9b314d38563d4e0c1f57c22073ca820baf22fde7c4164c110f16772335ca04714934e8510ea7147e9b483766e54d5189ec54d33f5bd38f0c6cc413de3feacb SHA512 9e2f6c15c56066e87d676c38c214cb2d50ea77ddb79b5bdd0f085b79552fa14a7fd285ba72c5266495f90c829afa428786daf258c3c7bd46f676b02ce8d94c31 +EBUILD libnet-1.0.2a-r6.ebuild 1310 BLAKE2B a022c848c68aac837bb39b2cf22d9812bcfcd4337c2015c9a245bc8b9448e37260da9ba18f41c5099287900ad3107a18122b1bb5e2c59d626a088393a649b0eb SHA512 641fbbade6ccf33957314b2ac191b932584390e5878851442b06f8ee8149733fb5b3c47f90ffcb630aa46145ba763e2e50da54c66b7b603651fa605dfc543d62 EBUILD libnet-1.2_rc3-r1.ebuild 1161 BLAKE2B 983679b21ec4ebb3a69eecb0cf430f708c8eadbf21f76d08bb270f1584614c535b2d5200987e0155c9574b13daef3f65beb137ca32077441744f747e26e1557f SHA512 fa57847f6208a610f5226e5bc5b1086c40991d60b95f1c7df1934c6932a5e8f448e8380729cbdbf4d225adbdd8997938df7d00b8cdb4fb03c5c96e61c8508079 -EBUILD libnet-1.2_rc3.ebuild 1071 BLAKE2B 92dcb2ca48d015e5e615d297995dbc4e6c7f1f4be413c396c1b54cd09ad374a7adcc87de6f427d0f3c65e8a4bb3bae86e98a6c97753d031eb0e88dec20b6ef15 SHA512 b941b03be64f3f58f11b71c8eb1265a574bc87cffdfe3006216ac0f90e01a7b315e9add93cbcbe40ef67cba1e83a9f4ed7a3bfb2df2fbbd7d18ea5c290683e0c MISC metadata.xml 1223 BLAKE2B 298fe374db9d5ea958dc437c06804b63b4460912df52701942cad3794a9f6d6d64df47484b09fd67f276e960e30cc4c34d91318410a689c70565c6b6cede1671 SHA512 2049508adf4563ee25fdd204a6f2c22a08e53605df0b95d7a5a41c407b5b2d01263132b2aca71a24f8bbc57b64a91146ca2130117fd6181b6ba67079e6c9a10c diff --git a/net-libs/libnet/files/1.0.2a-endian.patch b/net-libs/libnet/files/1.0.2a-endian.patch deleted file mode 100644 index aad0bacb2f2e..000000000000 --- a/net-libs/libnet/files/1.0.2a-endian.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/include/libnet.h -+++ b/include/libnet.h -@@ -32,6 +32,17 @@ - #ifndef __LIBNET_H - #define __LIBNET_H - -+#include -+#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 - #include - #include diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch deleted file mode 100644 index bcc0d56113f5..000000000000 --- a/net-libs/libnet/files/1.0.2a-slot.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -18,17 +18,17 @@ - LIB_PREFIX = @libdir@/ - MAN_PREFIX = @MAN_PREFIX@ - --LIBNET = libnet --LIBPWRITE = libpwrite -+LIBNET = libnet-1.0 -+LIBPWRITE = libpwrite-1.0 - LIB = lib/$(LIBNET).a - MAN = doc/$(LIBNET).3 - INCLUDE = include/$(LIBNET).h --INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h --INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h --INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h --INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h --INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h --INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h -+INCLUDE-H = include/libnet/$(LIBNET)-headers.h -+INCLUDE-F = include/libnet/$(LIBNET)-functions.h -+INCLUDE-S = include/libnet/$(LIBNET)-structures.h -+INCLUDE-M = include/libnet/$(LIBNET)-macros.h -+INCLUDE-A = include/libnet/$(LIBNET)-asn1.h -+INCLUDE-O = include/libnet/$(LIBNET)-ospf.h - CONFIG = $(LIBNET)-config - DEFINES += @DEFS@ - RANLIB = @RANLIB@ -@@ -94,7 +94,7 @@ - install: libnet - $(ENSUREDIR) $(DESTDIR)$(prefix) 755 - $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755 -- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755 -+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755 - $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755 -@@ -102,12 +102,12 @@ - rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a - cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a - $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX) -- $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -+ $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/ -+ $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/ - $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX) - $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX) - -@@ -142,6 +142,6 @@ - cd support/bpf-lkm/etherspoof && rm -rf Makefile; \ - fi - rm -f config.log config.cache config.status Makefile include/config.h \ -- version.h support/bpf-lkm/etherspoof conftest* libnet-config -+ version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config - - # EOF ---- 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 \ - test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \ -- libnet-config, chmod +x libnet-config) -+ libnet-1.0-config, chmod +x libnet-1.0-config) - - dnl EOF ---- a/include/libnet.h -+++ b/include/libnet.h -@@ -74,12 +74,12 @@ - #include - #include - --#include "./libnet/libnet-headers.h" --#include "./libnet/libnet-structures.h" --#include "./libnet/libnet-macros.h" --#include "./libnet/libnet-asn1.h" --#include "./libnet/libnet-functions.h" --#include "./libnet/libnet-ospf.h" -+#include "./libnet/libnet-1.0-headers.h" -+#include "./libnet/libnet-1.0-structures.h" -+#include "./libnet/libnet-1.0-macros.h" -+#include "./libnet/libnet-1.0-asn1.h" -+#include "./libnet/libnet-1.0-functions.h" -+#include "./libnet/libnet-1.0-ospf.h" - - #define LIBNET_VERSION "1.0.2a" - ---- a/libnet-config.in -+++ b/libnet-config.in -@@ -9,12 +9,12 @@ - - libnet_defines="@LIBNET_CONFIG_DEFINES@" - libnet_cflags="@LIBNET_CONFIG_CFLAGS@" --libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet" -+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0" - - usage() - { - cat < ++#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 + #include + #include diff --git a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch new file mode 100644 index 000000000000..dd77d05dff2a --- /dev/null +++ b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch @@ -0,0 +1,12 @@ +--- a/configure.in.JeR ++++ b/configure.in +@@ -51,8 +51,7 @@ + dnl + if test $ac_cv_prog_gcc = yes; then + dnl if test -z $CFLAGS; then +- CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall' +- CFLAGS="$CCOPTS" ++: + dnl fi + fi + diff --git a/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch new file mode 100644 index 000000000000..c4f3ae925705 --- /dev/null +++ b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch @@ -0,0 +1,13 @@ +--- a/include/libnet.h ++++ b/include/libnet.h +@@ -84,8 +84,8 @@ + #define LIBNET_VERSION "1.0.2a" + + #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN) +-#error "byte order has not been specified, you'll +-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the ++#error "byte order has not been specified, you'll \ ++need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the \ + documentation regarding the libnet-config script." + #endif + diff --git a/net-libs/libnet/files/libnet-1.0.2a-slot.patch b/net-libs/libnet/files/libnet-1.0.2a-slot.patch new file mode 100644 index 000000000000..bcc0d56113f5 --- /dev/null +++ b/net-libs/libnet/files/libnet-1.0.2a-slot.patch @@ -0,0 +1,189 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -18,17 +18,17 @@ + LIB_PREFIX = @libdir@/ + MAN_PREFIX = @MAN_PREFIX@ + +-LIBNET = libnet +-LIBPWRITE = libpwrite ++LIBNET = libnet-1.0 ++LIBPWRITE = libpwrite-1.0 + LIB = lib/$(LIBNET).a + MAN = doc/$(LIBNET).3 + INCLUDE = include/$(LIBNET).h +-INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h +-INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h +-INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h +-INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h +-INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h +-INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h ++INCLUDE-H = include/libnet/$(LIBNET)-headers.h ++INCLUDE-F = include/libnet/$(LIBNET)-functions.h ++INCLUDE-S = include/libnet/$(LIBNET)-structures.h ++INCLUDE-M = include/libnet/$(LIBNET)-macros.h ++INCLUDE-A = include/libnet/$(LIBNET)-asn1.h ++INCLUDE-O = include/libnet/$(LIBNET)-ospf.h + CONFIG = $(LIBNET)-config + DEFINES += @DEFS@ + RANLIB = @RANLIB@ +@@ -94,7 +94,7 @@ + install: libnet + $(ENSUREDIR) $(DESTDIR)$(prefix) 755 + $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755 +- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755 ++ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755 + $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755 + $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 + $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755 +@@ -102,12 +102,12 @@ + rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a + cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a + $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX) +- $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET) +- $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET) +- $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET) +- $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET) +- $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET) +- $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET) ++ $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/ ++ $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/ ++ $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/ ++ $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/ ++ $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/ ++ $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/ + $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX) + $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX) + +@@ -142,6 +142,6 @@ + cd support/bpf-lkm/etherspoof && rm -rf Makefile; \ + fi + rm -f config.log config.cache config.status Makefile include/config.h \ +- version.h support/bpf-lkm/etherspoof conftest* libnet-config ++ version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config + + # EOF +--- 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 \ + test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \ +- libnet-config, chmod +x libnet-config) ++ libnet-1.0-config, chmod +x libnet-1.0-config) + + dnl EOF +--- a/include/libnet.h ++++ b/include/libnet.h +@@ -74,12 +74,12 @@ + #include + #include + +-#include "./libnet/libnet-headers.h" +-#include "./libnet/libnet-structures.h" +-#include "./libnet/libnet-macros.h" +-#include "./libnet/libnet-asn1.h" +-#include "./libnet/libnet-functions.h" +-#include "./libnet/libnet-ospf.h" ++#include "./libnet/libnet-1.0-headers.h" ++#include "./libnet/libnet-1.0-structures.h" ++#include "./libnet/libnet-1.0-macros.h" ++#include "./libnet/libnet-1.0-asn1.h" ++#include "./libnet/libnet-1.0-functions.h" ++#include "./libnet/libnet-1.0-ospf.h" + + #define LIBNET_VERSION "1.0.2a" + +--- a/libnet-config.in ++++ b/libnet-config.in +@@ -9,12 +9,12 @@ + + libnet_defines="@LIBNET_CONFIG_DEFINES@" + libnet_cflags="@LIBNET_CONFIG_CFLAGS@" +-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet" ++libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0" + + usage() + { + cat <