From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- net-wireless/Manifest.gz | Bin 17925 -> 17929 bytes net-wireless/hidclient/Manifest | 2 +- net-wireless/hidclient/hidclient-20120728.ebuild | 7 +- net-wireless/horst/Manifest | 6 +- net-wireless/horst/horst-5.1.ebuild | 5 +- net-wireless/horst/horst-9999.ebuild | 5 +- net-wireless/horst/metadata.xml | 16 +- net-wireless/hostapd/Manifest | 7 +- ...-not-allow-event-subscriptions-with-URLs-.patch | 150 +++++++++++ ...x-event-message-generation-using-a-long-U.patch | 59 +++++ ...ndle-HTTP-initiation-failures-for-events-.patch | 47 ++++ net-wireless/hostapd/hostapd-2.9-r1.ebuild | 2 +- net-wireless/hostapd/hostapd-2.9-r2.ebuild | 275 -------------------- net-wireless/hostapd/hostapd-2.9-r3.ebuild | 279 +++++++++++++++++++++ net-wireless/kismet/Manifest | 4 +- net-wireless/kismet/kismet-2020.09.3.ebuild | 183 -------------- net-wireless/kismet/kismet-2020.09.4.ebuild | 183 ++++++++++++++ net-wireless/soapyremote/Manifest | 4 +- net-wireless/soapyremote/soapyremote-0.5.0.ebuild | 2 - net-wireless/soapyremote/soapyremote-9999.ebuild | 2 - net-wireless/unifi/Manifest | 16 +- net-wireless/unifi/unifi-5.13.29.ebuild | 68 ----- net-wireless/unifi/unifi-5.13.32.ebuild | 68 ----- net-wireless/unifi/unifi-5.14.22.ebuild | 68 ----- net-wireless/unifi/unifi-5.14.23.ebuild | 68 ----- net-wireless/unifi/unifi-6.0.20.ebuild | 68 ----- net-wireless/unifi/unifi-6.0.22.ebuild | 68 ----- net-wireless/unifi/unifi-6.0.23.ebuild | 2 +- net-wireless/unifi/unifi-6.0.24.ebuild | 68 +++++ 29 files changed, 822 insertions(+), 910 deletions(-) create mode 100644 net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch create mode 100644 net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch create mode 100644 net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch delete mode 100644 net-wireless/hostapd/hostapd-2.9-r2.ebuild create mode 100644 net-wireless/hostapd/hostapd-2.9-r3.ebuild delete mode 100644 net-wireless/kismet/kismet-2020.09.3.ebuild create mode 100644 net-wireless/kismet/kismet-2020.09.4.ebuild delete mode 100644 net-wireless/unifi/unifi-5.13.29.ebuild delete mode 100644 net-wireless/unifi/unifi-5.13.32.ebuild delete mode 100644 net-wireless/unifi/unifi-5.14.22.ebuild delete mode 100644 net-wireless/unifi/unifi-5.14.23.ebuild delete mode 100644 net-wireless/unifi/unifi-6.0.20.ebuild delete mode 100644 net-wireless/unifi/unifi-6.0.22.ebuild create mode 100644 net-wireless/unifi/unifi-6.0.24.ebuild (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index 0aed63339512..782841988e33 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/hidclient/Manifest b/net-wireless/hidclient/Manifest index 19512d851440..983cf0ee3838 100644 --- a/net-wireless/hidclient/Manifest +++ b/net-wireless/hidclient/Manifest @@ -1,5 +1,5 @@ AUX README 1100 BLAKE2B c3862f7cea283a2e5a227f9c2a556986f1d9fa90763fdb9b622bf4e4724351b6c8a76620bd418365f3750d920d941a42a60814d8564d815cf5d7fa7050fba6fb SHA512 21026c2ac24cc925fb140aef70ca2041688ff6fd0736649177d78a7e24d433fd939075b9bd315f7daff3ddfb7e49823a83ee591f0163e0f9fdc236f8cab86966 AUX hidclient-20120728-glibc-2.30.patch 267 BLAKE2B f7739d6aea6c90149c8eef238c26c20aee428009aa3921e9f61de384330359a39944fd351ac1d976aea48c904643b761686bc3f1fbd888fcaf57760fc99d874e SHA512 59321f735a6339c815ffbba25900e6bb12b700b0200fa65f1aac496ea8fd53d359e8a97cd758a19ccde0f4e9f2ea41ecd45b068c9ae3050b1386fb8d003bd223 DIST hidclient-20120728.tar.bz2 12563 BLAKE2B 7192a92c8673d533d35110b893c784272ef15530763815311cfe81b0e22b81fd6211aab6ee40b948f187c7e4d3884663750f3a11c07e60ab474ad900ff1508fe SHA512 c928d5844c7ed0cb20421c9241a938d39bb7d65accf9493817c6d9e1de9049a5e8256838b086ff6a44023259656c0c985c2155ed125838c6a2d73439c21884d4 -EBUILD hidclient-20120728.ebuild 699 BLAKE2B 9112cd0c9a1c701f5579bf1b80117878e4cf059daff38ba4ee267eb17e6584240e1a97fe1ba97220af473da9fe19c354debe46c65d3120b15a98cbf5cebdd9a8 SHA512 a22b2867e320c22fc0c78512601d92e7e539646c4c8a7f8763841d2f19a7b950d4c9d93ed1cb13743a9358b9cd089360d0601b415f55b99873700ed975c0b64f +EBUILD hidclient-20120728.ebuild 696 BLAKE2B bc8cc79e4ec8f8eb25293fba8dbc8669263eb31d05a2c28babd83d301e68b5a84d552e4fa7870e755373f59579b4db344f1aeb3438088ec576b6fd6700055322 SHA512 ef76f2fcd7b37a03dfffdb8f2677e0c34b5b8e1a1d4bc92eb1858486a0cc8c2d7fbd5e8cf064693484653246fbeba4360de71fca96dfb575ad5290e21e0e6a43 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f diff --git a/net-wireless/hidclient/hidclient-20120728.ebuild b/net-wireless/hidclient/hidclient-20120728.ebuild index 0dc32ee4fc03..77d1882e7720 100644 --- a/net-wireless/hidclient/hidclient-20120728.ebuild +++ b/net-wireless/hidclient/hidclient-20120728.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit epatch +EAPI=7 DESCRIPTION="Use your machine as a bluetooh keyboard/mouse" HOMEPAGE="http://anselm.hoffmeister.be/computer/hidclient/" @@ -21,7 +19,8 @@ RDEPEND="${DEPEND} S="${WORKDIR}" src_prepare() { - epatch "${FILESDIR}"/${P}-glibc-2.30.patch + eapply_user + eapply "${FILESDIR}"/${P}-glibc-2.30.patch sed -i 's#gcc#$(CC)#' Makefile sed -i 's#-O2#$(CFLAGS) $(LDFLAGS)#' Makefile } diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest index 3db101ac0e04..79e72418e3b8 100644 --- a/net-wireless/horst/Manifest +++ b/net-wireless/horst/Manifest @@ -3,6 +3,6 @@ AUX horst-5.1-pcap_bufsize.patch 872 BLAKE2B 8a6efdf7becf69b161cb582dd3d1331eb02 AUX horst-5.1-tinfo.patch 263 BLAKE2B 94082bdde6de7ebf957628b963e25189c2db0c37cbc96f1d7854b9c35139ce9c8c942e9a70ce0f49b99687253d484c371cacd8d0d823649de7a0768fa197bbef SHA512 955491bbbe5c997b941e0654d028fd8aefd9e789f2ec57204b0e5a11d1cac0a83f0101ea73182b4be9d4690e891bea097b37f29d506ae3eeb90d7da6f7c41d76 AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfdd59462f6dae311b82556004065df7b6177d8e1a506a1fabb92454f70f379bfce334234374ad01a300c2b7ae SHA512 54990da3d2825f2ff128379c81aa3f396f8b57429b73ee7301cb57f67f7bc90726980e4db78be95fd8372d6158ff8df9a68db13d9f76994502a95941d27aac17 DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4 -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 +EBUILD horst-5.1.ebuild 917 BLAKE2B f113b14134e3b483d0bf0bd0ab78ccfe9384f4e0c72384c0327fd20a462a17fbba011de4d655dbc097f3e48ae993d429cfabe07fef2220fa9eaad10feeec12b5 SHA512 9b0c50431ec08caa00866e6460107b1234c9e6e590539c562a5dbfd97b09cc597a30d470d00328b11bcfb8a4b828cf88776bc5b597894e51f279ce6743db64f4 +EBUILD horst-9999.ebuild 825 BLAKE2B f9319d9bfed03826fd4674ee90c2717937d5a3ed0a8d3407add274e10370395b6c9dadc76897e32422a90422223bbddde502bc3e741acfa778e80a43e848dd39 SHA512 6c8ab21a9518968fa94460396f80c13903b93ffb96165542f201ace57784d0ab8d7e6a1492c769d21ea1de5ace5d774de549d3277609faf6351e437764f13308 +MISC metadata.xml 384 BLAKE2B c5ef8d5aa073047775c3e6947ef3f7660ec56d3930058be1e922cba34834bab5bf163ff9173114f1047a9f9047c480e76de41911461f2c4efd6087fe3931ead9 SHA512 f44d4f5e884f4fdacd1f5d14d95362add156603fbacea7261c72fdcd9bc08671720093b4f7ccb8ee947481f74a558ed5f82da857835a219f77c5e4136ec339c9 diff --git a/net-wireless/horst/horst-5.1.ebuild b/net-wireless/horst/horst-5.1.ebuild index 1e0f7e8997dd..fe07351a1f43 100644 --- a/net-wireless/horst/horst-5.1.ebuild +++ b/net-wireless/horst/horst-5.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 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/" +HOMEPAGE="https://github.com/br101/horst/" SRC_URI="https://github.com/br101/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" @@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug +pcap test" RDEPEND=" + dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) " diff --git a/net-wireless/horst/horst-9999.ebuild b/net-wireless/horst/horst-9999.ebuild index 3e8968e69d14..493b4bd6edac 100644 --- a/net-wireless/horst/horst-9999.ebuild +++ b/net-wireless/horst/horst-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit git-r3 toolchain-funcs DESCRIPTION="Small 802.11 wireless LAN analyzer" -HOMEPAGE="http://br1.einfach.org/tech/horst/" +HOMEPAGE="https://github.com/br101/horst/" EGIT_REPO_URI="https://github.com/br101/${PN}/" LICENSE="GPL-2" @@ -14,6 +14,7 @@ KEYWORDS="" IUSE="debug +pcap test" RDEPEND=" + dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) " diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml index cf7bc3e28239..e5dffb5e0bcf 100644 --- a/net-wireless/horst/metadata.xml +++ b/net-wireless/horst/metadata.xml @@ -1,11 +1,13 @@ - - - Add support for network packet capture via net-libs/libpcap - - - br101/horst - + +netmon@gentoo.org + + +Add support for network packet capture via net-libs/libpcap + + +br101/horst + diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index b4a41b6ec398..5f18b9a78a27 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -1,7 +1,10 @@ +AUX hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch 5909 BLAKE2B 2a5e3650e9872aaed73085131f3a6f80a12bf7d353b4df927346a9f2c13e828b9c4196386ded935f0ff960eee380be49325a98541bbc23a99cfe3f00e91581fe SHA512 b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c +AUX hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch 2284 BLAKE2B 0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06 SHA512 00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c +AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch 1553 BLAKE2B 736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac SHA512 69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c -EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 97627e934b0c86d435a332bba6f05f6716ec4fe8af73a94dfd0c5e88f13f92b9ad9b1cf59f99a8fb04f80a91cc6df459155490e874b669b4d7f85e2109b7a1da SHA512 a49d0df20aebdb4681511cbee8ac102d1de3e87f349938ea4e8d8d7bdd6695b6753da37db0bfb69c0a3e3c6b4028f1b4411e5866c02a305687a997fac55adfc1 -EBUILD hostapd-2.9-r2.ebuild 7139 BLAKE2B b97d52c79de0384395f28c84ff1e5e64f63451b4468b1ad2dd3fc9d80210c696dd32b34b0f6a4d97390bbd455fab394590bf5c4b75dfd93c92570145f9aec00f SHA512 2bc40e7fb59298bf530445ee1fb2c6981595bae92f777de099054ce86c7a79ac6c3a7baa797b03dd658e208a4e846497b921d5bda2e2beb10eb8a6bb3dfecc92 +EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 8651030448176873599cf48122c958fbd48130506be543f674a5811cbf1fbca224e6b70610d737aba40d4880f9db976771df314e917b93f84edb1ef3a2bf2379 SHA512 c25fff3e0767cdaadb8f8c181916422b127f0851f66150333a2c1cda89493f1b162f63975f3eca6eb2d181121201a8b74a55436a4b540005bb9918f8c2180253 +EBUILD hostapd-2.9-r3.ebuild 7440 BLAKE2B b90a96b77b1fa2857fb1390ffb50791c8fa755f44d84f9817dceaf1546e620ee530e7fe18e6b725d35e3f6d4869866d28c5d7253b1c15b7c8f16fc9641299be0 SHA512 659e4f514d648dde03674edcd3bd3d5214cb46b380144006d18a145c4db806609faf37c7ecd3a976f65ba7bbeb5bbf839ceba2e029e2db13eb280effba181d67 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d diff --git a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch new file mode 100644 index 000000000000..0aa8a5ea1de0 --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch @@ -0,0 +1,150 @@ +From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Wed, 3 Jun 2020 23:17:35 +0300 +Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to + other networks + +The UPnP Device Architecture 2.0 specification errata ("UDA errata +16-04-2020.docx") addresses a problem with notifications being allowed +to go out to other domains by disallowing such cases. Do such filtering +for the notification callback URLs to avoid undesired connections to +external networks based on subscriptions that any device in the local +network could request when WPS support for external registrars is +enabled (the upnp_iface parameter in hostapd configuration). + +Signed-off-by: Jouni Malinen +--- + src/wps/wps_er.c | 2 +- + src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++-- + src/wps/wps_upnp_i.h | 3 ++- + 3 files changed, 39 insertions(+), 4 deletions(-) + +diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c +index 6bded14327f8..31d2e50e4cff 100644 +--- a/src/wps/wps_er.c ++++ b/src/wps/wps_er.c +@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter) + "with %s", filter); + } + if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text, +- er->mac_addr)) { ++ NULL, er->mac_addr)) { + wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " + "for %s. Does it have IP address?", er->ifname); + wps_er_deinit(er, NULL, NULL); +diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c +index 6e10e4bc0c3f..7d4b7439940e 100644 +--- a/src/wps/wps_upnp.c ++++ b/src/wps/wps_upnp.c +@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s) + } + + ++static int local_network_addr(struct upnp_wps_device_sm *sm, ++ struct sockaddr_in *addr) ++{ ++ return (addr->sin_addr.s_addr & sm->netmask.s_addr) == ++ (sm->ip_addr & sm->netmask.s_addr); ++} ++ ++ + /* subscr_addr_add_url -- add address(es) for one url to subscription */ + static void subscr_addr_add_url(struct subscription *s, const char *url, + size_t url_len) +@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + + for (rp = result; rp; rp = rp->ai_next) { + struct subscr_addr *a; ++ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr; + + /* Limit no. of address to avoid denial of service attack */ + if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) { +@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + break; + } + ++ if (!local_network_addr(s->sm, addr)) { ++ wpa_printf(MSG_INFO, ++ "WPS UPnP: Ignore a delivery URL that points to another network %s", ++ inet_ntoa(addr->sin_addr)); ++ continue; ++ } ++ + a = os_zalloc(sizeof(*a) + alloc_len); + if (a == NULL) + break; +@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) + * @net_if: Selected network interface name + * @ip_addr: Buffer for returning IP address in network byte order + * @ip_addr_text: Buffer for returning a pointer to allocated IP address text ++ * @netmask: Buffer for returning netmask or %NULL if not needed + * @mac: Buffer for returning MAC address + * Returns: 0 on success, -1 on failure + */ + int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, +- u8 mac[ETH_ALEN]) ++ struct in_addr *netmask, u8 mac[ETH_ALEN]) + { + struct ifreq req; + int sock = -1; +@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, + in_addr.s_addr = *ip_addr; + os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr)); + ++ if (netmask) { ++ os_memset(&req, 0, sizeof(req)); ++ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); ++ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) { ++ wpa_printf(MSG_ERROR, ++ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)", ++ errno, strerror(errno)); ++ goto fail; ++ } ++ addr = (struct sockaddr_in *) &req.ifr_netmask; ++ netmask->s_addr = addr->sin_addr.s_addr; ++ } ++ + #ifdef __linux__ + os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); + if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) { +@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if) + + /* Determine which IP and mac address we're using */ + if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text, +- sm->mac_addr)) { ++ &sm->netmask, sm->mac_addr)) { + wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " + "for %s. Does it have IP address?", net_if); + goto fail; + } ++ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr " ++ MACSTR, ++ sm->ip_addr_text, inet_ntoa(sm->netmask), ++ MAC2STR(sm->mac_addr)); + + /* Listen for incoming TCP connections so that others + * can fetch our "xml files" from us. +diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h +index e87a93232df1..6ead7b4e9a30 100644 +--- a/src/wps/wps_upnp_i.h ++++ b/src/wps/wps_upnp_i.h +@@ -128,6 +128,7 @@ struct upnp_wps_device_sm { + u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */ + char *ip_addr_text; /* IP address of network i.f. we use */ + unsigned ip_addr; /* IP address of network i.f. we use (host order) */ ++ struct in_addr netmask; + int multicast_sd; /* send multicast messages over this socket */ + int ssdp_sd; /* receive discovery UPD packets on socket */ + int ssdp_sd_registered; /* nonzero if we must unregister */ +@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm, + const u8 uuid[UUID_LEN]); + void subscr_addr_delete(struct subscr_addr *a); + int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, +- u8 mac[ETH_ALEN]); ++ struct in_addr *netmask, u8 mac[ETH_ALEN]); + + /* wps_upnp_ssdp.c */ + void msearchreply_state_machine_stop(struct advertisement_state_machine *a); +-- +2.20.1 + diff --git a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch new file mode 100644 index 000000000000..c7a449e0b5c6 --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch @@ -0,0 +1,59 @@ +From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Wed, 3 Jun 2020 22:41:02 +0300 +Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL + path + +More than about 700 character URL ended up overflowing the wpabuf used +for building the event notification and this resulted in the wpabuf +buffer overflow checks terminating the hostapd process. Fix this by +allocating the buffer to be large enough to contain the full URL path. +However, since that around 700 character limit has been the practical +limit for more than ten years, start explicitly enforcing that as the +limit or the callback URLs since any longer ones had not worked before +and there is no need to enable them now either. + +Signed-off-by: Jouni Malinen +--- + src/wps/wps_upnp.c | 9 +++++++-- + src/wps/wps_upnp_event.c | 3 ++- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c +index 7d4b7439940e..ab685d52ecab 100644 +--- a/src/wps/wps_upnp.c ++++ b/src/wps/wps_upnp.c +@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + int rerr; + size_t host_len, path_len; + +- /* url MUST begin with http: */ +- if (url_len < 7 || os_strncasecmp(url, "http://", 7)) ++ /* URL MUST begin with HTTP scheme. In addition, limit the length of ++ * the URL to 700 characters which is around the limit that was ++ * implicitly enforced for more than 10 years due to a bug in ++ * generating the event messages. */ ++ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) { ++ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL"); + goto fail; ++ } + url += 7; + url_len -= 7; + +diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c +index d7e6edcc6503..08a23612f338 100644 +--- a/src/wps/wps_upnp_event.c ++++ b/src/wps/wps_upnp_event.c +@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e) + struct wpabuf *buf; + char *b; + +- buf = wpabuf_alloc(1000 + wpabuf_len(e->data)); ++ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) + ++ wpabuf_len(e->data)); + if (buf == NULL) + return NULL; + wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path); +-- +2.20.1 + diff --git a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch new file mode 100644 index 000000000000..9d0376043d0b --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch @@ -0,0 +1,47 @@ +From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Thu, 4 Jun 2020 21:24:04 +0300 +Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more + properly + +While it is appropriate to try to retransmit the event to another +callback URL on a failure to initiate the HTTP client connection, there +is no point in trying the exact same operation multiple times in a row. +Replve the event_retry() calls with event_addr_failure() for these cases +to avoid busy loops trying to repeat the same failing operation. + +These potential busy loops would go through eloop callbacks, so the +process is not completely stuck on handling them, but unnecessary CPU +would be used to process the continues retries that will keep failing +for the same reason. + +Signed-off-by: Jouni Malinen +--- + src/wps/wps_upnp_event.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c +index 08a23612f338..c0d9e41d9a38 100644 +--- a/src/wps/wps_upnp_event.c ++++ b/src/wps/wps_upnp_event.c +@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s) + + buf = event_build_message(e); + if (buf == NULL) { +- event_retry(e, 0); ++ event_addr_failure(e); + return -1; + } + +@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s) + event_http_cb, e); + if (e->http_event == NULL) { + wpabuf_free(buf); +- event_retry(e, 0); ++ event_addr_failure(e); + return -1; + } + +-- +2.20.1 + diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild b/net-wireless/hostapd/hostapd-2.9-r1.ebuild index a2fbc42dc16e..379f8c74ea7c 100644 --- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild +++ b/net-wireless/hostapd/hostapd-2.9-r1.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="6" diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild b/net-wireless/hostapd/hostapd-2.9-r2.ebuild deleted file mode 100644 index e14a5f1ff72a..000000000000 --- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs systemd savedconfig - -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="http://w1.fi" -EXTRAS_VER="2.7-r2" -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" -SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" - -if [[ $PV == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://w1.fi/hostap.git" -else - if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then - SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz" - else - SRC_URI+=" https://w1.fi/releases/${P}.tar.gz" - fi - # Never stabilize snapshot ebuilds please - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda" - -# suiteb impl uses openssl feature not available in libressl, see bug 710992 -REQUIRED_USE="?? ( libressl suiteb )" - -DEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - ) - kernel_linux? ( - dev-libs/libnl:3 - crda? ( net-wireless/crda ) - ) - netlink? ( net-libs/libnfnetlink ) - sqlite? ( >=dev-db/sqlite-3 )" - -RDEPEND="${DEPEND}" - -S="${S}/${PN}" - -pkg_pretend() { - if use internal-tls; then - if use libressl; then - elog "libressl flag takes precedence over internal-tls" - else - ewarn "internal-tls implementation is experimental and provides fewer features" - fi - fi -} - -src_unpack() { - # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds - default - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - # Allow users to apply patches to src/drivers for example, - # i.e. anything outside ${S}/${PN} - pushd ../ >/dev/null || die - default - #CVE-2019-16275 bug #696032 - eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" - popd >/dev/null || die - - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ - "${S}/hostapd.conf" || die -} - -src_configure() { - local CONFIG="${S}/.config" - - restore_config "${CONFIG}" - if [[ -f "${CONFIG}" ]]; then - default_src_configure - return 0 - fi - - # toolchain setup - echo "CC = $(tc-getCC)" > ${CONFIG} - - # EAP authentication methods - echo "CONFIG_EAP=y" >> ${CONFIG} - echo "CONFIG_ERP=y" >> ${CONFIG} - echo "CONFIG_EAP_MD5=y" >> ${CONFIG} - echo "CONFIG_SAE=y" >> ${CONFIG} - echo "CONFIG_OWE=y" >> ${CONFIG} - echo "CONFIG_DPP=y" >> ${CONFIG} - - if use suiteb; then - echo "CONFIG_SUITEB=y" >> ${CONFIG} - echo "CONFIG_SUITEB192=y" >> ${CONFIG} - fi - - if use internal-tls && ! use libressl; then - echo "CONFIG_TLS=internal" >> ${CONFIG} - else - # SSL authentication methods - echo "CONFIG_EAP_FAST=y" >> ${CONFIG} - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} - echo "CONFIG_TLSV11=y" >> ${CONFIG} - echo "CONFIG_TLSV12=y" >> ${CONFIG} - echo "CONFIG_EAP_PWD=y" >> ${CONFIG} - fi - - if use wps; then - # Enable Wi-Fi Protected Setup - echo "CONFIG_WPS=y" >> ${CONFIG} - echo "CONFIG_WPS2=y" >> ${CONFIG} - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} - echo "CONFIG_WPS_NFC=y" >> ${CONFIG} - einfo "Enabling Wi-Fi Protected Setup support" - fi - - echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} - echo "CONFIG_EAP_TNC=y" >> ${CONFIG} - echo "CONFIG_EAP_GTC=y" >> ${CONFIG} - echo "CONFIG_EAP_SIM=y" >> ${CONFIG} - echo "CONFIG_EAP_AKA=y" >> ${CONFIG} - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} - echo "CONFIG_EAP_EKE=y" >> ${CONFIG} - echo "CONFIG_EAP_PAX=y" >> ${CONFIG} - echo "CONFIG_EAP_PSK=y" >> ${CONFIG} - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} - - einfo "Enabling drivers: " - - # drivers - echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} - einfo " HostAP driver enabled" - echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} - einfo " Wired driver enabled" - echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} - einfo " None driver enabled" - - einfo " nl80211 driver enabled" - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} - - # epoll - echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} - - # misc - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} - echo "CONFIG_PKCS12=y" >> ${CONFIG} - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} - echo "CONFIG_IAPP=y" >> ${CONFIG} - echo "CONFIG_IEEE80211R=y" >> ${CONFIG} - echo "CONFIG_IEEE80211W=y" >> ${CONFIG} - echo "CONFIG_IEEE80211N=y" >> ${CONFIG} - echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} - echo "CONFIG_PEERKEY=y" >> ${CONFIG} - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} - echo "CONFIG_INTERWORKING=y" >> ${CONFIG} - echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} - echo "CONFIG_HS20=y" >> ${CONFIG} - echo "CONFIG_WNM=y" >> ${CONFIG} - echo "CONFIG_FST=y" >> ${CONFIG} - echo "CONFIG_FST_TEST=y" >> ${CONFIG} - echo "CONFIG_ACS=y" >> ${CONFIG} - - if use netlink; then - # Netlink support - echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} - fi - - if use ipv6; then - # IPv6 support - echo "CONFIG_IPV6=y" >> ${CONFIG} - fi - - if use sqlite; then - # Sqlite support - echo "CONFIG_SQLITE=y" >> ${CONFIG} - fi - - # If we are using libnl 2.0 and above, enable support for it - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then - echo "CONFIG_LIBNL32=y" >> .config - fi - - # TODO: Add support for BSD drivers - - default_src_configure -} - -src_compile() { - emake V=1 - - if use libressl || ! use internal-tls; then - emake V=1 nt_password_hash - emake V=1 hlr_auc_gw - fi -} - -src_install() { - insinto /etc/${PN} - doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} - - fperms -R 600 /etc/${PN} - - dosbin ${PN} - dobin ${PN}_cli - - if use libressl || ! use internal-tls; then - dobin nt_password_hash hlr_auc_gw - fi - - newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} - newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} - systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service - - doman ${PN}{.8,_cli.1} - - dodoc ChangeLog README - use wps && dodoc README-WPS - - docinto examples - dodoc wired.conf - - if use logwatch; then - insinto /etc/log.d/conf/services/ - doins logwatch/${PN}.conf - - exeinto /etc/log.d/scripts/services/ - doexe logwatch/${PN} - fi - - save_config .config -} - -pkg_postinst() { - einfo - einfo "If you are running openRC you need to follow this instructions:" - einfo "In order to use ${PN} you need to set up your wireless card" - einfo "for master mode in /etc/conf.d/net and then start" - einfo "/etc/init.d/${PN}." - einfo - einfo "Example configuration:" - einfo - einfo "config_wlan0=( \"192.168.1.1/24\" )" - einfo "channel_wlan0=\"6\"" - einfo "essid_wlan0=\"test\"" - einfo "mode_wlan0=\"master\"" - einfo - #if [ -e "${KV_DIR}"/net/mac80211 ]; then - # einfo "This package now compiles against the headers installed by" - # einfo "the kernel source for the mac80211 driver. You should " - # einfo "re-emerge ${PN} after upgrading your kernel source." - #fi - - if use wps; then - einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${P}" - einfo "for info on how to use WPS" - fi -} diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild new file mode 100644 index 000000000000..af3b036853f5 --- /dev/null +++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit toolchain-funcs systemd savedconfig + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="http://w1.fi" +EXTRAS_VER="2.7-r2" +EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" +SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" + +if [[ $PV == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://w1.fi/hostap.git" +else + if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then + SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz" + else + SRC_URI+=" https://w1.fi/releases/${P}.tar.gz" + fi + # Never stabilize snapshot ebuilds please + KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda" + +# suiteb impl uses openssl feature not available in libressl, see bug 710992 +REQUIRED_USE="?? ( libressl suiteb )" + +DEPEND=" + libressl? ( dev-libs/libressl:0= ) + !libressl? ( + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist] ) + ) + kernel_linux? ( + dev-libs/libnl:3 + crda? ( net-wireless/crda ) + ) + netlink? ( net-libs/libnfnetlink ) + sqlite? ( >=dev-db/sqlite-3 )" + +RDEPEND="${DEPEND}" + +S="${S}/${PN}" + +pkg_pretend() { + if use internal-tls; then + if use libressl; then + elog "libressl flag takes precedence over internal-tls" + else + ewarn "internal-tls implementation is experimental and provides fewer features" + fi + fi +} + +src_unpack() { + # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds + default + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + # Allow users to apply patches to src/drivers for example, + # i.e. anything outside ${S}/${PN} + pushd ../ >/dev/null || die + default + #CVE-2019-16275 bug #696032 + eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" + # CVE-2020-12695 bug #727542 + eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch" + eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch" + eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch" + popd >/dev/null || die + + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${S}/hostapd.conf" || die +} + +src_configure() { + local CONFIG="${S}/.config" + + restore_config "${CONFIG}" + if [[ -f "${CONFIG}" ]]; then + default_src_configure + return 0 + fi + + # toolchain setup + echo "CC = $(tc-getCC)" > ${CONFIG} + + # EAP authentication methods + echo "CONFIG_EAP=y" >> ${CONFIG} + echo "CONFIG_ERP=y" >> ${CONFIG} + echo "CONFIG_EAP_MD5=y" >> ${CONFIG} + echo "CONFIG_SAE=y" >> ${CONFIG} + echo "CONFIG_OWE=y" >> ${CONFIG} + echo "CONFIG_DPP=y" >> ${CONFIG} + + if use suiteb; then + echo "CONFIG_SUITEB=y" >> ${CONFIG} + echo "CONFIG_SUITEB192=y" >> ${CONFIG} + fi + + if use internal-tls && ! use libressl; then + echo "CONFIG_TLS=internal" >> ${CONFIG} + else + # SSL authentication methods + echo "CONFIG_EAP_FAST=y" >> ${CONFIG} + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} + echo "CONFIG_TLSV11=y" >> ${CONFIG} + echo "CONFIG_TLSV12=y" >> ${CONFIG} + echo "CONFIG_EAP_PWD=y" >> ${CONFIG} + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> ${CONFIG} + echo "CONFIG_WPS2=y" >> ${CONFIG} + echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} + echo "CONFIG_WPS_NFC=y" >> ${CONFIG} + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} + echo "CONFIG_EAP_TNC=y" >> ${CONFIG} + echo "CONFIG_EAP_GTC=y" >> ${CONFIG} + echo "CONFIG_EAP_SIM=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} + echo "CONFIG_EAP_EKE=y" >> ${CONFIG} + echo "CONFIG_EAP_PAX=y" >> ${CONFIG} + echo "CONFIG_EAP_PSK=y" >> ${CONFIG} + echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} + + einfo "Enabling drivers: " + + # drivers + echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} + einfo " HostAP driver enabled" + echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} + einfo " Wired driver enabled" + echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} + einfo " None driver enabled" + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} + + # epoll + echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} + + # misc + echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} + echo "CONFIG_PKCS12=y" >> ${CONFIG} + echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} + echo "CONFIG_IAPP=y" >> ${CONFIG} + echo "CONFIG_IEEE80211R=y" >> ${CONFIG} + echo "CONFIG_IEEE80211W=y" >> ${CONFIG} + echo "CONFIG_IEEE80211N=y" >> ${CONFIG} + echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} + echo "CONFIG_PEERKEY=y" >> ${CONFIG} + echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} + echo "CONFIG_INTERWORKING=y" >> ${CONFIG} + echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} + echo "CONFIG_HS20=y" >> ${CONFIG} + echo "CONFIG_WNM=y" >> ${CONFIG} + echo "CONFIG_FST=y" >> ${CONFIG} + echo "CONFIG_FST_TEST=y" >> ${CONFIG} + echo "CONFIG_ACS=y" >> ${CONFIG} + + if use netlink; then + # Netlink support + echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} + fi + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> ${CONFIG} + fi + + if use sqlite; then + # Sqlite support + echo "CONFIG_SQLITE=y" >> ${CONFIG} + fi + + # If we are using libnl 2.0 and above, enable support for it + # Removed for now, since the 3.2 version is broken, and we don't + # support it. + if has_version ">=dev-libs/libnl-3.2"; then + echo "CONFIG_LIBNL32=y" >> .config + fi + + # TODO: Add support for BSD drivers + + default_src_configure +} + +src_compile() { + emake V=1 + + if use libressl || ! use internal-tls; then + emake V=1 nt_password_hash + emake V=1 hlr_auc_gw + fi +} + +src_install() { + insinto /etc/${PN} + doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} + + fperms -R 600 /etc/${PN} + + dosbin ${PN} + dobin ${PN}_cli + + if use libressl || ! use internal-tls; then + dobin nt_password_hash hlr_auc_gw + fi + + newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} + newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} + systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service + + doman ${PN}{.8,_cli.1} + + dodoc ChangeLog README + use wps && dodoc README-WPS + + docinto examples + dodoc wired.conf + + if use logwatch; then + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} + fi + + save_config .config +} + +pkg_postinst() { + einfo + einfo "If you are running openRC you need to follow this instructions:" + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/${PN}." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + #if [ -e "${KV_DIR}"/net/mac80211 ]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "for info on how to use WPS" + fi +} diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index 4bf56ce893d8..abb2aab202a1 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -5,9 +5,9 @@ AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2 -DIST kismet-2020-09-R3.tar.xz 8692092 BLAKE2B a38a889aa382e597e11c7fe0452e0faf40a991f6ece7fcb29a9605bc158b629647bf6117c6bd72e957f5a6f2b89788983f120130b3a6f0f31ae3a386dcdfdb44 SHA512 b1c0daee20c59124059cfa71d5ab938c47f143a467e14b442aaf67a372599ff799a08951745cedb6f38e5cded7f5a30834bf03adee53846a90a593a0b3231a6a +DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 9d2cb57cc3728ebaeb8ccf8b9ed4716473c4930d006d4b6f1b5badb21e6433da49b24e4d9a1f41dff698ec198cae7d09450266a78f7be67b65cfbfd61b459ca2 SHA512 4463682c7ebba71368ecb28f9ac89789be91de8c11f2ff3a1395ad4101f3ce8da2fef5e0622d211b885b9d1cacde82f27cd73aeb1079b6415af7b232dd730090 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a -EBUILD kismet-2020.09.3.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b +EBUILD kismet-2020.09.4.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b MISC metadata.xml 1445 BLAKE2B e915106684538d82bbd7488f9a1e37990a6b7c8bec8265db850797beeacdef58671f5635f186c21afca9c0c0964fcdb8bf6589d9d235e3e91eaa0c0d88dc5548 SHA512 33bafa9ff07daa54dcca14b76a80f01ed483e0952abe254f9a9627655f998922e7a2ff006fa6e24d6009af5ce78dd43ac43900f0ea61a22541110ce5b7d6cc86 diff --git a/net-wireless/kismet/kismet-2020.09.3.ebuild b/net-wireless/kismet/kismet-2020.09.3.ebuild deleted file mode 100644 index 06840c1eb328..000000000000 --- a/net-wireless/kismet/kismet-2020.09.3.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools eutils multilib python-single-r1 udev systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" - inherit git-r3 - RESTRICT="strip" -else - MY_P=${P/\./-} - MY_P=${MY_P/_beta/-BETA} - MY_P=${MY_P/./-R} - S=${WORKDIR}/${MY_P/BETA/beta} - - #normally we want an official release - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" - - #but sometimes we want a git commit - #COMMIT="9ca7e469cf115469f392db7436816151867e1654" - #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #S="${WORKDIR}/${PN}-${COMMIT}" - - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -fi - -DESCRIPTION="IEEE 802.11 wireless LAN sniffer" -HOMEPAGE="https://www.kismetwireless.net" - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -CDEPEND=" - ${PYTHON_DEPS} - acct-user/kismet - acct-group/kismet - networkmanager? ( net-misc/networkmanager:= ) - dev-libs/glib:= - dev-libs/elfutils:= - sys-libs/zlib:= - dev-db/sqlite:= - net-libs/libmicrohttpd - kernel_linux? ( sys-libs/libcap - dev-libs/libnl:3 - net-libs/libpcap - ) - libusb? ( virtual/libusb:1 ) - dev-libs/protobuf-c:= - dev-libs/protobuf:= - $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] - ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) - " - -DEPEND="${CDEPEND} - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - $(python_gen_cond_dep ' - dev-python/pyserial[${PYTHON_MULTI_USEDEP}] - ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" - rtlsdr? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - net-wireless/rtl-sdr - )" - -src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet_logging.conf || die - - #this was added to quiet macosx builds but it makes gcc builds noisier - sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die - - #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in - - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in || die - - eapply_user - - #just use set to fix setup.py - find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - - if [ "${PV}" = "9999" ]; then - eautoreconf - fi -} - -src_configure() { - econf \ - $(use_enable libusb libusb) \ - $(use_enable pcre) \ - $(use_enable lm-sensors lmsensors) \ - $(use_enable networkmanager libnm) \ - $(use_enable ubertooth) \ - --sysconfdir=/etc/kismet \ - --disable-optimization -} - -src_install() { - emake DESTDIR="${D}" commoninstall - python_optimize - emake DESTDIR="${D}" forceconfigs - use udev && udev_dorules packaging/udev/*.rules - - insinto /usr/share/${PN} - doins Makefile.inc - - dodoc CHANGELOG README* - newinitd "${FILESDIR}"/${PN}.initd-r3 kismet - newconfd "${FILESDIR}"/${PN}.confd-r2 kismet - systemd_dounit packaging/systemd/kismet.service -} - -pkg_preinst() { - if use suid; then - fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth - fowners root:kismet /usr/bin/kismet_cap_linux_wifi - fowners root:kismet /usr/bin/kismet_cap_pcapfile - # Need to set the permissions after chowning. - # See chown(2) - fperms 4550 /usr/bin/kismet_cap_linux_bluetooth - fperms 4550 /usr/bin/kismet_cap_linux_wifi - fperms 4550 /usr/bin/kismet_cap_pcapfile - elog "Kismet has been installed with a setuid-root helper binary" - elog "to enable minimal-root operation. Users need to be part of" - elog "the 'kismet' group to perform captures from physical devices." - fi - if ! use suid; then - ewarn "It is highly discouraged to run a sniffer as root," - ewarn "Please consider enabling the suid use flag and adding" - ewarn "your user to the kismet group." - fi -} - -migrate_config() { - einfo "Kismet Configuration files are now read from /etc/kismet/" - ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then - ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" - fi - if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location" - ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf" - elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits" - ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf" - fi -} - -pkg_postinst() { - if [ -n "${REPLACING_VERSIONS}" ]; then - for v in ${REPLACING_VERSIONS}; do - if ver_test ${v} -lt 2019.07.2 ; then - migrate_config - break - fi - if ver_test ${v} -eq 9999 ; then - migrate_config - break - fi - done - fi -} diff --git a/net-wireless/kismet/kismet-2020.09.4.ebuild b/net-wireless/kismet/kismet-2020.09.4.ebuild new file mode 100644 index 000000000000..06840c1eb328 --- /dev/null +++ b/net-wireless/kismet/kismet-2020.09.4.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools eutils multilib python-single-r1 udev systemd + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" + inherit git-r3 + RESTRICT="strip" +else + MY_P=${P/\./-} + MY_P=${MY_P/_beta/-BETA} + MY_P=${MY_P/./-R} + S=${WORKDIR}/${MY_P/BETA/beta} + + #normally we want an official release + SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" + + #but sometimes we want a git commit + #COMMIT="9ca7e469cf115469f392db7436816151867e1654" + #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +fi + +DESCRIPTION="IEEE 802.11 wireless LAN sniffer" +HOMEPAGE="https://www.kismetwireless.net" + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +CDEPEND=" + ${PYTHON_DEPS} + acct-user/kismet + acct-group/kismet + networkmanager? ( net-misc/networkmanager:= ) + dev-libs/glib:= + dev-libs/elfutils:= + sys-libs/zlib:= + dev-db/sqlite:= + net-libs/libmicrohttpd + kernel_linux? ( sys-libs/libcap + dev-libs/libnl:3 + net-libs/libpcap + ) + libusb? ( virtual/libusb:1 ) + dev-libs/protobuf-c:= + dev-libs/protobuf:= + $(python_gen_cond_dep ' + dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] + ') + sys-libs/ncurses:= + lm-sensors? ( sys-apps/lm-sensors ) + pcre? ( dev-libs/libpcre ) + suid? ( sys-libs/libcap ) + ubertooth? ( net-wireless/ubertooth:= ) + " + +DEPEND="${CDEPEND} + virtual/pkgconfig +" + +RDEPEND="${CDEPEND} + $(python_gen_cond_dep ' + dev-python/pyserial[${PYTHON_MULTI_USEDEP}] + ') + selinux? ( sec-policy/selinux-kismet ) +" +PDEPEND=" + rtlsdr? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + net-wireless/rtl-sdr + )" + +src_prepare() { + sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ + conf/kismet_logging.conf || die + + #this was added to quiet macosx builds but it makes gcc builds noisier + sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die + + #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in + + # Don't strip and set correct mangrp + sed -i -e 's| -s||g' \ + -e 's|@mangrp@|root|g' Makefile.in || die + + eapply_user + + #just use set to fix setup.py + find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die + find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die + + if [ "${PV}" = "9999" ]; then + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable libusb libusb) \ + $(use_enable pcre) \ + $(use_enable lm-sensors lmsensors) \ + $(use_enable networkmanager libnm) \ + $(use_enable ubertooth) \ + --sysconfdir=/etc/kismet \ + --disable-optimization +} + +src_install() { + emake DESTDIR="${D}" commoninstall + python_optimize + emake DESTDIR="${D}" forceconfigs + use udev && udev_dorules packaging/udev/*.rules + + insinto /usr/share/${PN} + doins Makefile.inc + + dodoc CHANGELOG README* + newinitd "${FILESDIR}"/${PN}.initd-r3 kismet + newconfd "${FILESDIR}"/${PN}.confd-r2 kismet + systemd_dounit packaging/systemd/kismet.service +} + +pkg_preinst() { + if use suid; then + fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth + fowners root:kismet /usr/bin/kismet_cap_linux_wifi + fowners root:kismet /usr/bin/kismet_cap_pcapfile + # Need to set the permissions after chowning. + # See chown(2) + fperms 4550 /usr/bin/kismet_cap_linux_bluetooth + fperms 4550 /usr/bin/kismet_cap_linux_wifi + fperms 4550 /usr/bin/kismet_cap_pcapfile + elog "Kismet has been installed with a setuid-root helper binary" + elog "to enable minimal-root operation. Users need to be part of" + elog "the 'kismet' group to perform captures from physical devices." + fi + if ! use suid; then + ewarn "It is highly discouraged to run a sniffer as root," + ewarn "Please consider enabling the suid use flag and adding" + ewarn "your user to the kismet group." + fi +} + +migrate_config() { + einfo "Kismet Configuration files are now read from /etc/kismet/" + ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" + if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then + ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" + fi + if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then + mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location" + ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf" + elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then + ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits" + ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf" + fi +} + +pkg_postinst() { + if [ -n "${REPLACING_VERSIONS}" ]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test ${v} -lt 2019.07.2 ; then + migrate_config + break + fi + if ver_test ${v} -eq 9999 ; then + migrate_config + break + fi + done + fi +} diff --git a/net-wireless/soapyremote/Manifest b/net-wireless/soapyremote/Manifest index 1600b85bbb99..ddb4959dbb1d 100644 --- a/net-wireless/soapyremote/Manifest +++ b/net-wireless/soapyremote/Manifest @@ -1,4 +1,4 @@ DIST soapyremote-0.5.0.tar.gz 71881 BLAKE2B e81f2df8f513df329289404de8f1f5916379a824bb51b0aa0e3b1bfc6af953a367119293db80374ef6c2ba6e638228eb8ffb5f0c9eb70a7dd61e2ff4e5641ef8 SHA512 5c5ce76c90dfbfc3b6846902f5dbf0c0906d92ae193a50d79733ce47403f1ec27dcf78d07fc198e8099272431c313984eb32c26306fb2afee129339e6501f3d2 -EBUILD soapyremote-0.5.0.ebuild 721 BLAKE2B e0cb6bab4fa75b836624a8c95b90be0a6d1df761e0b195b1f1aa04d99d680bc1273ab898ab520955bcc7cb60e7efe2e3011af77c140caf9a8c085ba5fe622b98 SHA512 eb2c437ef41e0deebe7205b7b481c32185747196721cdb2702cc32a8baa136f216a5363c8fea7d32c51e76d29c5f4ee7921e493786c81e01ce303db1ac3095e8 -EBUILD soapyremote-9999.ebuild 721 BLAKE2B e0cb6bab4fa75b836624a8c95b90be0a6d1df761e0b195b1f1aa04d99d680bc1273ab898ab520955bcc7cb60e7efe2e3011af77c140caf9a8c085ba5fe622b98 SHA512 eb2c437ef41e0deebe7205b7b481c32185747196721cdb2702cc32a8baa136f216a5363c8fea7d32c51e76d29c5f4ee7921e493786c81e01ce303db1ac3095e8 +EBUILD soapyremote-0.5.0.ebuild 682 BLAKE2B a673858ddac4c247c873b236038e24023b85c4f058285cea75a41ce9c04076ce9fef7e8968018886645d4488147fb73b2ea6badf7e490c2ff0190dc4625c4845 SHA512 67ddcda7d37bd37e290c6a0c329c549ed89348863558852ffa0ffbff98d07442dc03be2bce334bf98c3e8a6033f0dc1a118b110ca23e90ae50391dba159b1a4b +EBUILD soapyremote-9999.ebuild 682 BLAKE2B a673858ddac4c247c873b236038e24023b85c4f058285cea75a41ce9c04076ce9fef7e8968018886645d4488147fb73b2ea6badf7e490c2ff0190dc4625c4845 SHA512 67ddcda7d37bd37e290c6a0c329c549ed89348863558852ffa0ffbff98d07442dc03be2bce334bf98c3e8a6033f0dc1a118b110ca23e90ae50391dba159b1a4b MISC metadata.xml 336 BLAKE2B cf77d5c87670b460f2965ad571a9566510d3df71a56aed5d8b1ebbdbee2ee0332a073ff30c2410f628053ee33fe55b7d391e1a6de7802344b3c5fc5e792ed318 SHA512 b8b0bd12ddb26ac45f533bf7d46e8f2bd4306cee47283e0f71d7bfd9701a47bdb85c5082cc070a5b6bf42f518cff91861360ab68505594e3b3d35042f42d0a72 diff --git a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild b/net-wireless/soapyremote/soapyremote-0.5.0.ebuild index 1f7f06aaa68a..77a386aa4648 100644 --- a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild +++ b/net-wireless/soapyremote/soapyremote-0.5.0.ebuild @@ -3,8 +3,6 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - inherit cmake-utils DESCRIPTION="Soapy SDR remote module" diff --git a/net-wireless/soapyremote/soapyremote-9999.ebuild b/net-wireless/soapyremote/soapyremote-9999.ebuild index 1f7f06aaa68a..77a386aa4648 100644 --- a/net-wireless/soapyremote/soapyremote-9999.ebuild +++ b/net-wireless/soapyremote/soapyremote-9999.ebuild @@ -3,8 +3,6 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - inherit cmake-utils DESCRIPTION="Soapy SDR remote module" diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index caed3249824b..a478b02a0980 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -2,20 +2,10 @@ AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f080 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995 -DIST unifi-5.13.29.zip 151004470 BLAKE2B 0980c012bddbbeb5d18d26ebc8427137e410577e22a9c49b799f0e8fa39343191bc361b9345919917e53ded5ff0af2b35fd71e48072a09d5533a5e89feb9a20c SHA512 01b9811e288e377aff727416b32d966af5cc7a45e0f03f08f8892c89ad40a1833f4150bc42d8732468fcd2242c790bcd62b343132149a868c0d95f38b9f17dda -DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347f6384ff71b4e78d156d5a0a5309eb5bb0b05de31721a8dd21f917d0c5b87697a337ec096a1701640796defbb8 SHA512 f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab -DIST unifi-5.14.22.zip 242779284 BLAKE2B 7056229ff86db56e192c96cc61b9a5c0fba8cd96727a5260af39c5949fe0df49d8bac880ac7e016938e7d7f36b6fa378addef73a08b074e8795898ae3a4ded4f SHA512 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88 -DIST unifi-5.14.23.zip 195394703 BLAKE2B ba762712b958f4a784f281419edcd9f7622a4df4881e23a9bbf53b70ca8d9c2dd2452d8b567f1151c7cb7031947fcc0e79193c7b853a23f8faf4235edea62388 SHA512 e29969da15bed74fe24eb7b997c14247f3e8c53cc43021c402365f93cda3b7cc48b9222235770101ab37cdd574eb94d1aba445bc04393b70dac386b7a77cebb9 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989 -DIST unifi-6.0.20.zip 182776288 BLAKE2B 3b9aca0a7b356a1bab2e9f6af8da21ee43b7c4f14392292a0f25803395a12ad726ad7db46f4c4863841bf9c3cdc973ae5bfdd9e7dc48974494807e6ba15658b8 SHA512 926f78c3f9b3035e09a8592bd52239665fb379d9324ceae42494a55d01325028dd0d09f0692cd23466216958fe51153f2093f747fadbaf9aabd49c450233aae3 -DIST unifi-6.0.22.zip 183238039 BLAKE2B f76b59087922b46ec8db1869b167aeb62b3047e87e4f80de9ed32caa8e1d8210a384dc3ec1f06a59e2aaf740c5247539c215f821290c6c5f5398d05b37fd2fae SHA512 99e510a2c7f13929b436a73b5cb5d8d8ce48cfa4464bc610dd588c2af30cbb0f4b8c0fd8058a2108f2c3f0850f492445f6b1b9c1b6d84bfdb5e2af7cbe261283 DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881 -EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb -EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9 -EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758 -EBUILD unifi-5.14.23.ebuild 1566 BLAKE2B b41bc9e03b2812566edb82bf3127501cb12df15484045c267c2e47bf1eebdefc740ee978c36e914d3cd1911728b7a4871f2bfb2f90198d38b9c3a771299c4e4e SHA512 a9998d13dda0fd508595d0c53667fec28001c1ee5766422a793f8a512c22a1266933c21f5e6e3b17702f68cd328aa5202f810aa9da020fdd66c88b3e80c30afd +DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7 -EBUILD unifi-6.0.20.ebuild 1565 BLAKE2B c72187a8dfffd38f278f21540784ff62fe881dcc74bb7311e0f9a9171c09d8f19cd1dfa93366f6d7b7dcacef5368a9089c82959736c5179cb75578424f7bd698 SHA512 5e92a24ef3335e6d37a18797e2796374450a6e9adf12174b50c00ab16db1ce8bc87d7d13e11efc2710c9919f0f068e4de0fdc485571a3a530461fa5b16744c59 -EBUILD unifi-6.0.22.ebuild 1566 BLAKE2B c0c5d4420196da1fc8dbb66da2f5ce78b2832d687e36de47df4d90fd83d1fcfec0aafccf7865c4805d3cc198cd4731d07d89507a7205fdb8ae456f09eba03d3b SHA512 de2d1437717378e4a10db19c47ce5c6e6c3a840c35e2aa5f6c15cf2bef860532b258f9ad8220d07b2f8b28bd5be44de99e927a8fdd9c62f8a17988e3e436bb88 -EBUILD unifi-6.0.23.ebuild 1566 BLAKE2B 8d215f37409ce704ab95f64fa14cec750959be590b428c6e527ca820ccc8e6e983f8e137e7dec6e36b9771212cf479a70b2a05696414caf7d37ca66ab63bc850 SHA512 257e0107e1124a5805bee6a5ba21b6b689ee309c72882602a35d6aa056b15fe90605828233cabbe756a7b33ec7bd2ffffc6febbae951c5819593c25ce801a2ae +EBUILD unifi-6.0.23.ebuild 1565 BLAKE2B 56f4a5e9740cdd7bc9e34349164c9612152fc969f042bb82d0a7b08c46fc5ec2efa7539f0b1bda1f0469cd04c8a8988f773367497cb8b208f0df5cdd1d7fcabd SHA512 2a24a46c8656413cc847693580f830b6a4a379fb585640418b025cdb5c0c972fd0ef3ef2fc2a8ba7a9df98fd15fbd2c196e519bff47a54d652edfb69a45c41be +EBUILD unifi-6.0.24.ebuild 1566 BLAKE2B 1d2f8558ab7608c4d2db9e28f244c92aa7416439eb63bd02a27131debff9abed084cf03a1b4bce7d7286bad82ef686fed5d0940b8a2d27f5c3a76ae56505fd18 SHA512 9084039cfe18b5192bf3fe7afb21642c0fe1b17ecacfaef8c9007fc7ae0a308d91d3db6e2e13f943dd9be5ab667f72a4618e218b6d59aab7457dabbdfc924ea0 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0 diff --git a/net-wireless/unifi/unifi-5.13.29.ebuild b/net-wireless/unifi/unifi-5.13.29.ebuild deleted file mode 100644 index c9bdb8d27e60..000000000000 --- a/net-wireless/unifi/unifi-5.13.29.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-1fc0cd615f" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/5.13" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-5.13.32.ebuild b/net-wireless/unifi/unifi-5.13.32.ebuild deleted file mode 100644 index 652bbb55c840..000000000000 --- a/net-wireless/unifi/unifi-5.13.32.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-3e11950f9b" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="~amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/5.13" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-5.14.22.ebuild b/net-wireless/unifi/unifi-5.14.22.ebuild deleted file mode 100644 index f7657757712d..000000000000 --- a/net-wireless/unifi/unifi-5.14.22.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-9bf8d2f44f" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="~amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/5.14" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-5.14.23.ebuild b/net-wireless/unifi/unifi-5.14.23.ebuild deleted file mode 100644 index ddf7cd97fb43..000000000000 --- a/net-wireless/unifi/unifi-5.14.23.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-70ddb4015a" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/5.14" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.0.20.ebuild b/net-wireless/unifi/unifi-6.0.20.ebuild deleted file mode 100644 index 82a9960326c5..000000000000 --- a/net-wireless/unifi/unifi-6.0.20.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-816b9dfcdd" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/6.0" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.0.22.ebuild b/net-wireless/unifi/unifi-6.0.22.ebuild deleted file mode 100644 index 163cf5c3fb7a..000000000000 --- a/net-wireless/unifi/unifi-6.0.22.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Set this var for any releases except stable -RC_SUFFIX="-5cc1d1cd11" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="~amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/6.0" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.0.23.ebuild b/net-wireless/unifi/unifi-6.0.23.ebuild index 3b3f7c9e3fc3..53d19bcb20c0 100644 --- a/net-wireless/unifi/unifi-6.0.23.ebuild +++ b/net-wireless/unifi/unifi-6.0.23.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" HOMEPAGE="https://www.ubnt.com" SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" SLOT="0/6.0" IUSE="systemd" diff --git a/net-wireless/unifi/unifi-6.0.24.ebuild b/net-wireless/unifi/unifi-6.0.24.ebuild new file mode 100644 index 000000000000..b9e8e79d0068 --- /dev/null +++ b/net-wireless/unifi/unifi-6.0.24.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Set this var for any releases except stable +RC_SUFFIX="-b200bf6446" + +inherit systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" + +KEYWORDS="~amd64" +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/6.0" +IUSE="systemd" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:1.8 +" + +DEPEND="app-arch/unzip" + +RESTRICT="bindist mirror" + +S="${WORKDIR}/UniFi" + +DOCS=( "readme.txt" ) + +QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" + +src_prepare() { + # Remove unneeded files Linux, Mac and Windows + rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + + default +} + +src_install() { + insinto /usr/lib/unifi + doins -r bin dl lib webapps + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + newinitd "${FILESDIR}"/unifi.initd-r1 unifi + systemd_dounit "${FILESDIR}"/unifi.service + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs +} -- cgit v1.2.3