From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- net-analyzer/flow-tools/Manifest | 3 +- .../files/flow-tools-0.68.5.1-fno-common.patch | 42 ++++++++++++++++++++++ .../flow-tools/flow-tools-0.68.5.1-r10.ebuild | 3 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch (limited to 'net-analyzer/flow-tools') diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index f8c3eee6eb4b..c970e4041469 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,3 +1,4 @@ +AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B 183dc878e05baa7ba9e9c26079e8c22f4e0eee68cec917048bbd81911980bce88c5da753a7481eb35fc5f38e821d92bf80de4b8f6a1e5c974c1f7f696e540623 SHA512 bff9bcb57063cbdffbb169590e16d1d215b58726bf0fb6f069883cd9b483503d7f488cb76091e249905c8ad2a23b915b049f693b83eeca655d0c111363d9bef0 AUX flow-tools-0.68.5.1-openssl11.patch 1251 BLAKE2B 682c34b207517fc74e090c6aa04ba9acd7b4aa7bb2ea7b8cae45d608777b1a8760d6e22759dd10fcb4d5f3a9e258b34d07454efd2cc93134125d195b36714cd5 SHA512 c43cc2de4243b0567c07f66f0b674cb6974dee5689bbea50716ebc5cd49f4d66a739c39ff4ccadef23c7f84e26fe3a3cc4999b7db0bdda77035dbd5cfc678861 AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537 @@ -5,5 +6,5 @@ AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 -EBUILD flow-tools-0.68.5.1-r10.ebuild 1637 BLAKE2B 29bae346e3b76f36438d2c242a69ff82c4586cc603c626f9d3a24df64fd841d35d7668177e565d319a64ff3d2343240b7ae62860bd1a8a59171fad0de1130644 SHA512 4ab063f2495e3f362613e2877afa9e3e6df8e8e5058762d115aca7cc98732eda06b5fd88c2e15cd3291b7434d34f6c45d73a4266a5c021127bb842af9ad2b45b +EBUILD flow-tools-0.68.5.1-r10.ebuild 1674 BLAKE2B 0388edf037c985e35961e04268db72741ca859bf0018759849e54e66451bea1876c65dd0bc419d3b05d53755aeb6b7d1a8b722845d53d124638a469b04503cac SHA512 954c240c465fdda3dad18f15b95fcde793979c5589f5db31f3c67fc12e0aca539e91c6052f13daffae806010d1b3d26be132048a9ab4d9ab9ea64e2b256fa63e MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch new file mode 100644 index 000000000000..14623fa93f36 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch @@ -0,0 +1,42 @@ +--- ./src/acl2.h ++++ ./src/acl2.h +@@ -48,7 +48,7 @@ + #define ACL_TYPE_STD 1 + #define ACL_TYPE_EXT 2 + +-struct acl_list { ++typedef struct acl_list { + int num; /* number of entries */ + int num_std; /* number of standard acl entries */ + int num_ext; /* number of extended acl entries */ +@@ -59,6 +59,8 @@ + /* num_ext of these */ + }; + ++extern struct acl_list acl_list; ++ + struct acl_names { + int num; /* index into standard or extended list */ + char *name; /* name of this acl */ +--- a/src/aclyacc.y ++++ b/src/aclyacc.y +@@ -7,8 +7,6 @@ + unsigned char fmt_buf[32]; + unsigned char fmt_buf2[32]; + +-extern struct acl_list acl_list; +- + int x; + + %} +--- a/src/flow-filter.c ++++ b/src/flow-filter.c +@@ -56,8 +56,6 @@ + int debug; + int ip_net_only; + +-struct acl_list acl_list; +- + int yyparse (void); + void usage(void); + void yyerror(const char *msg); diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild index 4a048f0d81c0..8656ded05688 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-run.patch "${FILESDIR}"/${P}-syslog.patch "${FILESDIR}"/${P}-openssl11.patch + "${FILESDIR}"/${P}-fno-common.patch ) pkg_setup() { -- cgit v1.2.3