diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /net-wireless/horst | |
parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) |
gentoo resync : 20.02.2019
Diffstat (limited to 'net-wireless/horst')
-rw-r--r-- | net-wireless/horst/Manifest | 8 | ||||
-rw-r--r-- | net-wireless/horst/files/horst-5.1-CC.patch | 14 | ||||
-rw-r--r-- | net-wireless/horst/files/horst-5.1-pcap_bufsize.patch | 32 | ||||
-rw-r--r-- | net-wireless/horst/files/horst-5.1-tinfo.patch | 11 | ||||
-rw-r--r-- | net-wireless/horst/files/horst-9999-tinfo.patch | 11 | ||||
-rw-r--r-- | net-wireless/horst/horst-5.1.ebuild | 44 | ||||
-rw-r--r-- | net-wireless/horst/horst-9999.ebuild | 38 |
7 files changed, 142 insertions, 16 deletions
diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest index cb33f030db6e..3d88c73da495 100644 --- a/net-wireless/horst/Manifest +++ b/net-wireless/horst/Manifest @@ -1,6 +1,12 @@ +AUX horst-5.1-CC.patch 252 BLAKE2B 433c63fee4a658b36e9569496e83c7c9fc0700604d65e9fa90eb246b7e336ae289c95f40c9bbe4433525fae3ea14a483f2e5d627d8b4397d6824248855e5f71c SHA512 95dc5a34d20d2781077b9d67374eb10e50865300115987441f215d5060a4d620e861d4ce6e07fc39b83c2b8f35c208bf16595046e46520b9a09ba371aaf25f4c +AUX horst-5.1-pcap_bufsize.patch 872 BLAKE2B 8a6efdf7becf69b161cb582dd3d1331eb0288f74217a6c4451917b79f7469b03837efed00ae390c08c1f2da16b12bdfeca97c714aa0a849b22d2526881be5933 SHA512 52581262e9d3527c2db42935e74b328a41e3bfc6ebea6687053b82a230b223fe7fdea2e8cf8287caa921de0e95bfd04e0086046049882ba4c68b8b91013a4130 +AUX horst-5.1-tinfo.patch 263 BLAKE2B 94082bdde6de7ebf957628b963e25189c2db0c37cbc96f1d7854b9c35139ce9c8c942e9a70ce0f49b99687253d484c371cacd8d0d823649de7a0768fa197bbef SHA512 955491bbbe5c997b941e0654d028fd8aefd9e789f2ec57204b0e5a11d1cac0a83f0101ea73182b4be9d4690e891bea097b37f29d506ae3eeb90d7da6f7c41d76 +AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfdd59462f6dae311b82556004065df7b6177d8e1a506a1fabb92454f70f379bfce334234374ad01a300c2b7ae SHA512 54990da3d2825f2ff128379c81aa3f396f8b57429b73ee7301cb57f67f7bc90726980e4db78be95fd8372d6158ff8df9a68db13d9f76994502a95941d27aac17 DIST horst-4.2.tar.gz 97976 BLAKE2B 9f59e2dd6f67b50d0d6c67ff269f327e073edbfa87db5d3d63621116123cdcda3d85759e47bcd26344f750f87b0516589aff140542f2ef36cd12dddd048be60f SHA512 a6fa50d6eb0d2c2ae83dfccf59359f8cd74334dbc2362f01f1a3787ebb3d34bcdb76c34899cb048e4a4abc7353d72e8dd846b567ba228f9930e3f418b3656c0a DIST horst-5.0.tar.gz 115572 BLAKE2B a7702fe05a706f3f9cfd0545850451e1035840503c1fdf9377594d883095e41acaf89dca4ef9433f3a0109491932612e657dce8054a9f28c2bd725d230588bb1 SHA512 d2df54fade3d62b91482fb16e34f9b03567285880eceb5baea3f76b46caf1763909f3999b2924e210eb0ab0d9fd9f6444f31d2b06ea1a3b73a9f54e257cfd989 +DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4 EBUILD horst-4.2.ebuild 685 BLAKE2B ec04008d3e20a19b4ce054448eb16b9239e80fb831d4d97954458e2e646064ef03b33d91b171f6a9240ee8451f0e0d9940c3857128bf8d25003d8fa2618f6c34 SHA512 4eb7dddc151955b926ac4d61cdb8a433d8746272bb1c446bdabf0dfda5d86ac90758668f09bcf4c188341d3a658f77517ed67949b878f991daae4fdfb45ef4ad EBUILD horst-5.0.ebuild 727 BLAKE2B c680e63fd2044c4766e4a405f0329916578cdff4091c7d341c26b528532166c790f87e9ee1b6d719e9fdff890e91c2722ef3ae1f0e02ab1dbef588ee85864e36 SHA512 57001845bfcac12b7e1583e51edc8f2d7602c48788a6b83facb0bfab2c94a3afbce75a389322dd6fc11c4ff9235388017c1bbb4bcdf75e86e17222856bb80de6 -EBUILD horst-9999.ebuild 713 BLAKE2B 0ee020cc16331308558b1e9fea6dbeaf3e395bddc767afa5d8adbcadece4a23905f1a1df10ad83f51293df9bb6104cc2982cb939da5e436d1d4cb2bc134158bb SHA512 b2484a858a5c35f7000fe10ca0a2239d48232fef46342d8ce4f6305bec4fac0c929abf2cf14d4911cf7f8d6f2885643463b8b41f3e06c0a425ba907df27675d0 +EBUILD horst-5.1.ebuild 902 BLAKE2B a8a17629fbe942b75f755d860ec2c2ddc6524bf626d757f11bc273b7deaf4efbde1d782c0dc71171b402a0fde88a88ecc8ea679530851336ffedfb7773bb4c70 SHA512 c6042e1dd4c75fd41e94687a1231921b42883c35fb56ff97b5361a5c51b2876ab7b65026a1524a7603b6cabf719ec719bfe5957ae7cc7c55f8d065ea54e1ee48 +EBUILD horst-9999.ebuild 810 BLAKE2B a2fae8554af5eca1c8b62593a617f0a49b20fb736dbe3c6f0580ed05865de1ef569dd4f01298dc8dbcdd13cced825d9a218886952290416d0469c2f12e1dc79c SHA512 cb82f22c69fdaaf1343c4bc0df6c82eb48c3380bbe289988a8b805d4b892af7e7b65a873187a1bcbcee23d745773d21427f8e4580ae5836ae6dc9411cbd4db1a MISC metadata.xml 345 BLAKE2B cfd5f56689aa8af1450eeeadb90726bf94db301545fc4ec3f02bca2b6f2b53dcb2013c272530747bc6f42575c2cf92164b60091bb07cd819da2197c283a5fd98 SHA512 ad77a1b246b65a97abcedf9f80c8f37fba7081a4b3466ed734eb57042129d492c2851d13b7768f11dc412c9316d1ccb6f91575d11f6aed806a6972141057f653 diff --git a/net-wireless/horst/files/horst-5.1-CC.patch b/net-wireless/horst/files/horst-5.1-CC.patch new file mode 100644 index 000000000000..f9c2e5120ac8 --- /dev/null +++ b/net-wireless/horst/files/horst-5.1-CC.patch @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -99,9 +99,9 @@ + all: $(NAME) + + .objdeps.mk: $(OBJS:%.o=%.c) +- gcc -MM -I. $^ >$@ ++ $(CC) -MM -I. $^ >$@ + ifeq ($(OSX),1) +- gcc -MM -I. ifctrl-osx.m >>$@ ++ $(CC) -MM -I. ifctrl-osx.m >>$@ + endif + + -include .objdeps.mk diff --git a/net-wireless/horst/files/horst-5.1-pcap_bufsize.patch b/net-wireless/horst/files/horst-5.1-pcap_bufsize.patch new file mode 100644 index 000000000000..35f3f59dd98a --- /dev/null +++ b/net-wireless/horst/files/horst-5.1-pcap_bufsize.patch @@ -0,0 +1,32 @@ +--- a/capture-pcap.c ++++ b/capture-pcap.c +@@ -32,16 +32,16 @@ + #define PCAP_TIMEOUT 200 + + static unsigned char* pcap_buffer; +-static size_t pcap_bufsize; ++static size_t horst_pcap_bufsize; + static pcap_t *pcap_fp = NULL; + + static void handler(u_char *user, const struct pcap_pkthdr *h, const u_char *bytes) + { + *((int *)user) = h->len; +- if (pcap_bufsize < h->len) { ++ if (horst_pcap_bufsize < h->len) { + printlog("ERROR: Buffer(%d) too small for %d bytes", +- (int)pcap_bufsize, h->len); +- *((int *)user) = pcap_bufsize; ++ (int)horst_pcap_bufsize, h->len); ++ *((int *)user) = horst_pcap_bufsize; + } + memmove(pcap_buffer, bytes, *((int *)user)); + } +@@ -98,7 +98,7 @@ + { + int ret = 0; + pcap_buffer = buffer; +- pcap_bufsize = bufsize; ++ horst_pcap_bufsize = bufsize; + if (0 == pcap_dispatch(pcap_fp, 1, handler, (u_char *)&ret)) + return -1; + return ret; diff --git a/net-wireless/horst/files/horst-5.1-tinfo.patch b/net-wireless/horst/files/horst-5.1-tinfo.patch new file mode 100644 index 000000000000..059158e58cfc --- /dev/null +++ b/net-wireless/horst/files/horst-5.1-tinfo.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -54,7 +54,7 @@ + radiotap/radiotap.o \ + util.o \ + wlan_util.o +-LIBS=-lncurses -lm ++LIBS=$(shell $(PKG_CONFIG) --libs ncurses ) -lm + CFLAGS+=-std=gnu99 -Wall -Wextra -g -I. -DVERSION=\"$(VERSION)\" + + ifeq ($(OSX),1) diff --git a/net-wireless/horst/files/horst-9999-tinfo.patch b/net-wireless/horst/files/horst-9999-tinfo.patch new file mode 100644 index 000000000000..eb623d67b133 --- /dev/null +++ b/net-wireless/horst/files/horst-9999-tinfo.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + SRC += network.c + SRC += protocol_parser.c + +-LIBS = -lncurses -lm -luwifi ++LIBS = $(shell $(PKG_CONFIG) --libs ncurses ) -lm -luwifi + LDFLAGS += -Wl,-rpath,/usr/local/lib + + INCLUDES = -I. diff --git a/net-wireless/horst/horst-5.1.ebuild b/net-wireless/horst/horst-5.1.ebuild new file mode 100644 index 000000000000..1e0f7e8997dd --- /dev/null +++ b/net-wireless/horst/horst-5.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs vcs-snapshot + +DESCRIPTION="Small 802.11 wireless LAN analyzer" +HOMEPAGE="http://br1.einfach.org/tech/horst/" +SRC_URI="https://github.com/br101/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +pcap test" + +RDEPEND=" + sys-libs/ncurses:0 + pcap? ( net-libs/libpcap ) +" +TDEPEND=" + test? ( sys-devel/sparse ) +" +DEPEND=" + ${RDEPEND} + ${TDEPEND} + virtual/pkgconfig +" +RESTRICT=test #just semantic tests, no functional tests +PATCHES=( + "${FILESDIR}"/${PN}-5.1-CC.patch + "${FILESDIR}"/${PN}-5.1-pcap_bufsize.patch + "${FILESDIR}"/${PN}-5.1-tinfo.patch +) + +src_compile() { + tc-export CC PKG_CONFIG + emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0) +} + +src_install() { + dosbin ${PN}{,.sh} + dodoc README.md + doman ${PN}.8 +} diff --git a/net-wireless/horst/horst-9999.ebuild b/net-wireless/horst/horst-9999.ebuild index 7f4bb0baf2b2..3e8968e69d14 100644 --- a/net-wireless/horst/horst-9999.ebuild +++ b/net-wireless/horst/horst-9999.ebuild @@ -1,36 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit toolchain-funcs git-r3 +EAPI=6 +inherit git-r3 toolchain-funcs DESCRIPTION="Small 802.11 wireless LAN analyzer" -HOMEPAGE="https://github.com/br101/horst" -EGIT_REPO_URI="https://github.com/br101/${PN}" +HOMEPAGE="http://br1.einfach.org/tech/horst/" +EGIT_REPO_URI="https://github.com/br101/${PN}/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="debug +pcap test" -RDEPEND="sys-libs/ncurses:0 - pcap? ( net-libs/libpcap )" -DEPEND="${RDEPEND} - test? ( sys-devel/sparse )" - -#just semantic tests, no functional tests -RESTRICT=test +RDEPEND=" + sys-libs/ncurses:0 + pcap? ( net-libs/libpcap ) +" +TDEPEND=" + test? ( sys-devel/sparse ) +" +DEPEND=" + ${RDEPEND} + ${TDEPEND} + virtual/pkgconfig +" +RESTRICT=test #just semantic tests, no functional tests +PATCHES=( + "${FILESDIR}"/${PN}-9999-tinfo.patch +) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0) } src_install() { dosbin ${PN}{,.sh} dodoc README.md - doman ${PN}.8 ${PN}.conf.5 + doman ${PN}.8 insinto /etc doins ${PN}.conf } |