diff options
Diffstat (limited to 'net-wireless')
22 files changed, 490 insertions, 403 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex 2e3aa5d3cade..cb29c5b54e73 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 58788d7bfb98..7b86553b89e8 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -2,13 +2,10 @@ AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLA AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96 -AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531 AUX bluez-5.60-glibc-2.34.patch 1511 BLAKE2B 59035b078414358bf3ab66f92884dcef1d3795780d3ecad2d036dbfe7ee78dab027c9eb34185013ab89f5cbe2a6a0006e4d9420217f3231e27aafd2c5b92a9ec SHA512 ea78ae3771be72b269626c0c119d8d8f8d9b0874379bfd3ada58c9087aac3c55a7ab52a08503964aa397c03791beb918362bc35d0e87e74f5feca0c30bac0e0b AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6 -DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 -DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b DIST bluez-5.61.tar.xz 2137412 BLAKE2B 2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940 SHA512 a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a -EBUILD bluez-5.58-r1.ebuild 9352 BLAKE2B 5a61262e6209c7b9422ccab76eb64a16a0671d3fd3d10f8eceeb5189e5a8296a7929b54fde2ccf94e113abe63271be420c612c66be0832b861d823628b15186a SHA512 d3af406292d2c2aa1e05e4060436ef80b3c72170f03a61fbec149ef1a2254a6ad1f9ea4d620e6fae5f3504769b75f913257ff714049872f9ede92f27ca1de5ca -EBUILD bluez-5.60.ebuild 9391 BLAKE2B f139cda7de10f4bd73872f5cbf68febb08e728680a8156aba5bdfdc11a7965d3ec7fba4f171caf1e3bcc56ac26d512b35af9b4fef242a0e9921481fabe0a9fb1 SHA512 255a69f09619f19df01ce1166b9d99a0313f05ef2dc0b32774f32feaa88c05647045793067eff40eb37cb56c6058f316abe60fdc175c349da4df40e8040e6475 +DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8 EBUILD bluez-5.61.ebuild 9385 BLAKE2B 8ae4bf939cffe5d42440ae677aff36f98777f3e7f154c62c68fb2b53e13a6df305d4f47b4e86f25be250bf2325084549dab6075d9642b69086efa8cf3c9c845a SHA512 b9a5944f27d19aa5e8a0e34058946e1432e706f9c94be99337aca9d478ebd7edd2a016ad2da64cf9042ab43cb3b7ba486ab9aef88536c4925f5fe1950d5d416f +EBUILD bluez-5.62.ebuild 9285 BLAKE2B bdf223d01048d569bc030f1cec1502e5ced6dc348b102e1413831e3d1fed69c90beb23d7648739d8bb176d292b8927ea035a8a83d2b1100e365d86c9a9fc071e SHA512 a71ef65fdfd3caa163dec8be0d33eb6b51a9cb6f5217c61a08b30d0a8c6c135be71fc4a96daccfabbc7b36aea05a365831fbd8b2faebd245989b20b44f22120a MISC metadata.xml 1212 BLAKE2B 0b5305cc11d8a158397c71913b66be82b72db0e08cecdc98a2e24d2b77882a39752a2415a75758425fdfe4c06bfb98ab6526e55c2af2da2ddd697bab0d383b39 SHA512 f8fccab91d82cf6eced451e7f6d20ee721ba8199aa36f8771b79ef1707f5fb9239e9b7034cff4798c8ace0f209cca7c4d7d5f2f5744728f18c4c1e398c09dcd3 diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild deleted file mode 100644 index 18c11b1754e9..000000000000 --- a/net-wireless/bluez/bluez-5.58-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -REQUIRED_USE=" - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=sys-apps/hwids-20121202.2 - btpclient? ( >=dev-libs/ell-0.39 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.39 - >=dev-libs/json-c-0.13:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( - >=sys-apps/dbus-1.6:=[user-session=] - sys-apps/systemd - ) - !systemd? ( >=sys-apps/dbus-1.6:= ) - udev? ( >=virtual/udev-172 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # rfkill: Fix reading from rfkill socket - "${FILESDIR}"/${P}-rfkill.patch - - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html - # to prevent bugs like: - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER" - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugzilla.kernel.org/show_bug.cgi?id=206815 - if use mesh || use test; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH - ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" - fi - linux-info_pkg_setup - - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use user-session || ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch - fi - - eautoreconf - - if use cups; then - # Only not .am to not need to run eautoreconf only because of this - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ - Makefile.{in,tools} || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev hid2hci) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also they can break without" - ewarn "previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/" - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Drop python2 only test tools - # https://bugzilla.kernel.org/show_bug.cgi?id=206819 - rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206821 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206823 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use user-session && use systemd; then - ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth - newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth - - einstalldocs - use doc && dodoc doc/*.txt - # Install .json files as examples to be used by meshctl - if use mesh; then - dodoc tools/mesh-gatt/*.json - local DOC_CONTENTS="Some example .json files were installed into - /usr/share/doc/${PF} to be used with meshctl. Feel free to - uncompress and copy them to ~/.config/meshctl to use them." - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" - use mesh && readme.gentoo_print_elog -} diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.62.ebuild index a86c0dde25ae..1cf0b131ea8d 100644 --- a/net-wireless/bluez/bluez-5.60.ebuild +++ b/net-wireless/bluez/bluez-5.62.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal @@ -71,9 +71,6 @@ PATCHES=( # Fedora patches # http://www.spinics.net/lists/linux-bluetooth/msg40136.html "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch - - # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2 - "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch ) pkg_setup() { diff --git a/net-wireless/bluez/files/bluez-5.58-rfkill.patch b/net-wireless/bluez/files/bluez-5.58-rfkill.patch deleted file mode 100644 index dd7f2f978e72..000000000000 --- a/net-wireless/bluez/files/bluez-5.58-rfkill.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 382646b490c1c336dd32f9186293616ceb4d808b Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <bberg@redhat.com> -Date: Mon, 3 May 2021 14:45:00 +0200 -Subject: [PATCH 1/2] rfkill: Fix reading from rfkill socket - -The kernel will always send exactly one event, but the size of the -passed struct will depend on the length of the submitted read() and the -kernel version. i.e. the interface can be extended and we need to expect -for a read to be longer than expected if we ask for it. - -Fix this by only requesting the needed length and explicitly check the -length against the V1 version of the structure to make the code a bit -more future proof in case the internal copy of the struct is updated to -contain new fields. ---- - src/rfkill.c | 24 +++++++++++------------- - 1 file changed, 11 insertions(+), 13 deletions(-) - -diff --git a/src/rfkill.c b/src/rfkill.c -index ec9fcdfdd..2099c5ac5 100644 ---- a/src/rfkill.c -+++ b/src/rfkill.c -@@ -53,12 +53,12 @@ struct rfkill_event { - uint8_t soft; - uint8_t hard; - }; -+#define RFKILL_EVENT_SIZE_V1 8 - - static gboolean rfkill_event(GIOChannel *chan, - GIOCondition cond, gpointer data) - { -- unsigned char buf[32]; -- struct rfkill_event *event = (void *) buf; -+ struct rfkill_event event = { 0 }; - struct btd_adapter *adapter; - char sysname[PATH_MAX]; - ssize_t len; -@@ -69,34 +69,32 @@ static gboolean rfkill_event(GIOChannel *chan, - - fd = g_io_channel_unix_get_fd(chan); - -- memset(buf, 0, sizeof(buf)); -- -- len = read(fd, buf, sizeof(buf)); -+ len = read(fd, &event, sizeof(event)); - if (len < 0) { - if (errno == EAGAIN) - return TRUE; - return FALSE; - } - -- if (len != sizeof(struct rfkill_event)) -+ if (len < RFKILL_EVENT_SIZE_V1) - return TRUE; - - DBG("RFKILL event idx %u type %u op %u soft %u hard %u", -- event->idx, event->type, event->op, -- event->soft, event->hard); -+ event.idx, event.type, event.op, -+ event.soft, event.hard); - -- if (event->soft || event->hard) -+ if (event.soft || event.hard) - return TRUE; - -- if (event->op != RFKILL_OP_CHANGE) -+ if (event.op != RFKILL_OP_CHANGE) - return TRUE; - -- if (event->type != RFKILL_TYPE_BLUETOOTH && -- event->type != RFKILL_TYPE_ALL) -+ if (event.type != RFKILL_TYPE_BLUETOOTH && -+ event.type != RFKILL_TYPE_ALL) - return TRUE; - - snprintf(sysname, sizeof(sysname) - 1, -- "/sys/class/rfkill/rfkill%u/name", event->idx); -+ "/sys/class/rfkill/rfkill%u/name", event.idx); - - fd = open(sysname, O_RDONLY); - if (fd < 0) --- -2.31.1 - diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index 87054da8b7cd..7b8e548f3ea3 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -2,7 +2,7 @@ AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba9 AUX crda-4.14-openssl-1.1.0-compatibility.patch 8616 BLAKE2B c6c34a7575e79f67e3efca21c25aad489c1adb3c612d886b68c49c06b7c516bdfcf0f94a0838ca83c4e082ee9b3a4ffc382ff5de4c724febca5b59d21268f415 SHA512 ce8430b03a7315eb339d4d7b845cb28ea970010e47eba9a6a9199c67bb370fa7811ea1dcc2431790b2954d72fafbbb31bdcc691228e6e88b9dd066c51c2f06ef AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d814b9d7c84df3013aec43baf55f9c23367b15454218e39d3a0959355b4fd030dd4584b7420f6835a8ef421dd72c9 SHA512 b953be9da2ed770d89c905257c2e3f04451ce9ee2a61ee9cc18285b3d8209f8665f5f0a2a4ffb8a5211445cb45fe66dc4e3d302e90c4c0030c293c978dd443c6 AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d -AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f +AUX crda-ldflags.patch 797 BLAKE2B f1a8a47ef981c59c46c5f441812d238b8e3b80f75b93726b1b507bf9e143c094fc0525abe1bbcbe719868ee67843a3b2095c8d1a25e9dcca65ec13464643972e SHA512 f882826e2d8e8ca72e66a2c240953a0a35e83c775428f928a59fe334ba35526a6a89f5eb6868db6ae633b28e169c52da24ad194af0dd6c32eb633d35b9c843d8 AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9 diff --git a/net-wireless/crda/files/crda-ldflags.patch b/net-wireless/crda/files/crda-ldflags.patch index 5ba9165c7adc..13592127e928 100644 --- a/net-wireless/crda/files/crda-ldflags.patch +++ b/net-wireless/crda/files/crda-ldflags.patch @@ -1,11 +1,18 @@ ---- /Makefile -+++ /Makefile -@@ -115,7 +115,7 @@ +# https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/patch/?id=9856751feaf7b102547cea678a5da6c94252d83d +# https://bugs.gentoo.org/678450 +# https://bugs.gentoo.org/596352 + +--- a/Makefile ++++ b/Makefile +@@ -114,9 +114,9 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) + $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - $(LIBREG): regdb.h reglib.h reglib.c +-$(LIBREG): regdb.h reglib.h reglib.c ++$(LIBREG): reglib.c regdb.h reglib.h $(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(filter-out -lreg,$(LDLIBS)) install-libreg-headers: $(NQ) ' INSTALL libreg-headers' diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 3c4736b8bfbe..ae220792fcfd 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,10 +1,13 @@ AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f996132869ea4263594acf6966a96a8d99f1b1c936106c6d74b1a741a83afa121abe4fbebe7129ef3c29b8278739e38717 SHA512 f6d404a0e814e8f1f1cfe8a8d17ed93cf6586d3434130b4adad8c096ad37ca2280d86df8331766f2a8bac793f13c937d0d0de6c6c43a74ce055be4be4b5e2ee7 +AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142 +DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9 -EBUILD dump1090-5.0.ebuild 2584 BLAKE2B ee5aa34518399253f157b2cbd3c119248d1816421368e7cbd73c9d9c5872b4fb72f1fcd2ef7aa09bb51e859b72256076db0ddd67ce45ecf389f8a0f5888b6797 SHA512 4ad7981ce1f041f4b91313e3b0bef8bf2c60bc1b2e8d3cd17ee4820330eeb6fe7c4c8f24d41616a87407dd67571dc4eb780a95a56178b72a764d964a38ee8702 +EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1 +EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild index 9c76ce811944..00364313d593 100644 --- a/net-wireless/dump1090/dump1090-5.0.ebuild +++ b/net-wireless/dump1090/dump1090-5.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi @@ -30,6 +30,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-32bit-fix.patch" + "${FILESDIR}/${P}-further-32bit-fix.patch" ) src_prepare() { diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild new file mode 100644 index 000000000000..04ee546dcf91 --- /dev/null +++ b/net-wireless/dump1090/dump1090-6.1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit tmpfiles toolchain-funcs + +DESCRIPTION="simple Mode S decoder for RTLSDR devices" +HOMEPAGE="https://github.com/flightaware/dump1090" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="bladerf hackrf +rtlsdr minimal" + +DEPEND=" + sys-libs/ncurses:=[tinfo] + bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) + hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) + rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die + sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" \ + BLADERF=$(usex bladerf) \ + RTLSDR=$(usex rtlsdr) \ + HACKRF=$(usex hackrf) \ + CPUFEATURES=yes \ + LIMESDR=no +} + +src_install() { + dobin ${PN} + dobin view1090 + dodoc README.md README-json.md + # DSP config for bladerf + if use bladerf; then + insinto usr/share/${PN}/bladerf + doins bladerf/* + fi + + newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf + newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN} + newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN} + + if use !minimal; then + insinto /usr/share/${PN} + doins -r tools + + # Some tooling expects the -fa variant directory to contain the files + dosym ../../usr/share/${PN} /usr/share/dump1090-fa + + # Older HTML + insinto /usr/share/${PN}/html + doins -r public_html/* + # Newer HTML + insinto /usr/share/skyaware/html + doins -r public_html_merged/* + + # One of these this should be included into other lighttpd configs + insinto /usr/share/${PN}/lighttpd + # Old style: + doins debian/lighttpd/89-dump1090-fa.conf + doins debian/lighttpd/88-dump1090-fa-statcache.conf + # New style: + doins debian/lighttpd/89-skyaware.conf + + # See README.md for how to use custom wisdom files + exeinto /usr/share/${PN}/wisdom + doexe debian/generate-wisdom + insinto /usr/share/${PN}/wisdom + doins wisdom.* + doins wisdom/wisdom.* + # For /etc/dump1090-fa/wisdom.local + keepdir /etc/dump1090-fa/ + + # Tooling to generate custom wisdom: + exeinto /usr/libexec/${PN} + doexe starch-benchmark + fi +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch new file mode 100644 index 000000000000..bfcea2e4f88f --- /dev/null +++ b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch @@ -0,0 +1,52 @@ +https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch +https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch +https://bugs.gentoo.org/818130 + +From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001 +From: Oliver Jowett <oliver.jowett@flightaware.com> +Date: Sat, 13 Mar 2021 12:49:40 +0800 +Subject: [PATCH] Fix builds on 32-bit x86 + +--- + Makefile.cpufeatures | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures +index 099714e08..12377ad81 100644 +--- a/Makefile.cpufeatures ++++ b/Makefile.cpufeatures +@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin) + CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME + endif + +-ifeq ($(CPUFEATURES_ARCH), x86_64) ++ifeq ($(CPUFEATURES_ARCH),x86_64) ++ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o ++endif ++ ++ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) + CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o + endif + +From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001 +From: Oliver Jowett <oliver.jowett@flightaware.com> +Date: Wed, 17 Mar 2021 02:21:18 +0800 +Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86 + +--- + Makefile.cpufeatures | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures +index 12377ad81..8c3b8418d 100644 +--- a/Makefile.cpufeatures ++++ b/Makefile.cpufeatures +@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64) + CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o + endif + +-ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) ++ifneq (,$(filter i%86,$(CPUFEATURES_ARCH))) + CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o + endif + diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest index 866e33a75ed3..0b380418488e 100644 --- a/net-wireless/iwd/Manifest +++ b/net-wireless/iwd/Manifest @@ -1,10 +1,11 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d AUX iwd-1.17-fix-tests.patch 1358 BLAKE2B f399c13ce1c8594bcbe5a4bb84c7cbcf51121cd431dea492ff559b2b768bec56a2e6025771449838ad2a8929fa0a2c8e52495a44d6b7adb5ccaf4b52ecfc8486 SHA512 f63886a0844619442d0c9c662629a46c8075c859fb6fc614c09900ff3ea18335ec5369b50427983f34e8fe86ec13546f5a179770b1482cda0326a041c50ad1da +AUX iwd-1.18-musl-backport.patch 1014 BLAKE2B 47c89ce3f2d39c5c416be8b43a076cb914d5bb2431ea88e437d9966c608786ea00d71d713f143a2c6a957030b806e33c1d9a1ef739836430863f5b362c9f4e8c SHA512 7fc86e71f1c372052051c0ab73df7d301ff7498a8b70d95830bc099f0f4745a247ee54dc93de2e0173b284ac35f73fcad4cec04f1eb2dbe6ed1923d8e14e3035 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28 DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4 DIST iwd-1.18.tar.xz 961392 BLAKE2B 3c7b0a7996590435d8f8033ab0b6283b2860409064c8617eda51ecbd73102134bbced66bb4e1323b64563e21d52beaa7f88ae5168747a5a2a38355e266f9c3a4 SHA512 85c3e16bb8eb8e564072fab66b30d1636c853706546fcb35723b4b3339bcf969f08ca07bcd458521f044f407513f5d793724b316af4b7819def8400ed88f0d3b EBUILD iwd-1.15.ebuild 4928 BLAKE2B bbaf00a83a66e02df79499ebefd5591750f27daadf1c7b98c34c6095ef8281d1de08066e7f92b87f798b1b777dd9d398978e6b2a390b57da748cfbfe93a4822c SHA512 99df966cf16d483672803644533d9efcbd69521f8f5eb31cc5c96698fd05f617299cf1648259dfa09b81800060d591dc108de1dd31843c48e76e00d3890716a7 -EBUILD iwd-1.18.ebuild 4993 BLAKE2B 9fe39f41fe538aa53efedfee45c59adfc786389119c3997b3e49de090e4885f065c527f20a415fafafcdf052102a5cc74e5691ddb7dd0e513b16ae95ab5db08e SHA512 fea2645b93aadd33d50fc62a6895426fa13635184d9d5bca26d8d75bbc580eabf67c19645960b5bafc2db634ef091296123a61b8ef1a97192cdc5ff6f3cb7785 +EBUILD iwd-1.18.ebuild 5067 BLAKE2B c7f171ba3bd4b71fb0904d5f81e4c51e22c91515ae2c7de67aee586335516524dc0f189c653d82f40127b4c38a0d69899f0934712b5b406d7a2f5b3750a2b39a SHA512 d7b995827494fc42f192ed74611bab0ade76a4257b221dbe1ead1fa688765b08681fbbc59eb6f01da5fddf1aeb309d663ebf0f066a87064a5bd04c969ec69f44 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256 MISC metadata.xml 833 BLAKE2B ac036ef071fa52d3f5f5cb89abdc26c968de304e5398ef80361c3f48f963abb8e1200968ee6cf4741ea4977169774fc24885ca57372dff21f1a615390c9de651 SHA512 e64143df3c17e38f9ce8f154fc1ff1ee6df8596d4bc1c277e925bda9ee767d1d812b2b5e71472221f9b804d7b6501f817ad7e8693dd401bd9c257db65f14dfcf diff --git a/net-wireless/iwd/files/iwd-1.18-musl-backport.patch b/net-wireless/iwd/files/iwd-1.18-musl-backport.patch new file mode 100644 index 000000000000..99371ca3bb4e --- /dev/null +++ b/net-wireless/iwd/files/iwd-1.18-musl-backport.patch @@ -0,0 +1,30 @@ +From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001 +From: Andrew Zaborowski <andrew.zaborowski@intel.com> +Date: Thu, 16 Sep 2021 01:58:29 +0200 +Subject: netconfig: Remove usage of in6_addr.__in6_u + +in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in +the headers shipped with musl libc for example. The POSIX compliant and +universal way of accessing it is in6_addr.s6_addr. +--- + src/netconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'src/netconfig.c') + +diff --git a/src/netconfig.c b/src/netconfig.c +index ce95db0b..421270c9 100644 +--- a/src/netconfig.c ++++ b/src/netconfig.c +@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) + struct in6_addr in6_addr; + char *addr_str = l_malloc(INET6_ADDRSTRLEN); + +- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); ++ memcpy(in6_addr.s6_addr, addr, 16); + + if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, + INET6_ADDRSTRLEN)))) { +-- +cgit 1.2.3-1.el7 + diff --git a/net-wireless/iwd/iwd-1.18.ebuild b/net-wireless/iwd/iwd-1.18.ebuild index baedea95574d..92aca7db05e3 100644 --- a/net-wireless/iwd/iwd-1.18.ebuild +++ b/net-wireless/iwd/iwd-1.18.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86" MYRST2MAN="RST2MAN=:" fi @@ -22,8 +22,8 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" LICENSE="GPL-2" SLOT="0" -IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 -standalone systemd" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda elibc_musl +monitor ofono +standalone systemd wired" DEPEND=" sys-apps/dbus @@ -131,6 +131,7 @@ src_unpack() { src_prepare() { default + use elibc_musl && eapply "${FILESDIR}"/iwd-1.18-musl-backport.patch if [[ ${PV} == *9999* ]] ; then eautoreconf fi diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest index 1275f0e2de13..6ad980235827 100644 --- a/net-wireless/qdmr/Manifest +++ b/net-wireless/qdmr/Manifest @@ -1,6 +1,6 @@ DIST qdmr-0.8.1.tar.gz 3870631 BLAKE2B 3be78a398a41cb105abac07b2a3c3ddaf0a5e51b5af855860c5ea06a407447d71ae89d4f3be5d46ba8fd50c38baec42663977373c643813f4db193ab034cfb88 SHA512 068eaad49393dca4384146b5254342d57921fd2e3f972057dd0f6abc1f8ce1412ae544ab09f50ce0ffa50f48f7fb2145fc36e82c2c8f9cf534fedb60e947130d -DIST qdmr-0.9.0_alpha2.tar.gz 5560663 BLAKE2B dfbc09001990ed7b464ea7f58e8528d9c5c3ec890cdb8d0859a7f79f3cf2567b9c6fbaa81cf0fc7474320e200f1de98807c2f5232261261fd3f9950723ab6e70 SHA512 51c31ea3985d9e22437f5e4543633f4b0c866e0875152c65fc3dba429a650c013bd3b81425d373768a4e26783ccffd7339430087c1f0a3a756b041c0bd87ed6f +DIST qdmr-0.9.0_alpha3.tar.gz 5630070 BLAKE2B 5ba3a0f885bce39be88528541704d4dd7644588d689d28aba033e06174d677ae930c4ed2bc16f25bb0a2355a733d41d22c82dfaee3cd420acb788597a6fef350 SHA512 fb7c0689f2a03b632a305ebbc3a5ad3e5609bd6eec6490638ffce1534032110417e834863f3dd1c99a2cae92de7c7cb1d2a408ddcb5c5887cf0d31352cbf377c EBUILD qdmr-0.8.1.ebuild 1258 BLAKE2B 39b8677ddda9f3917bc9cd113960dd4fa7358eecfe7196e5bb3267d32d85cba420de00dcf75d78e9cb6527d523fdd1f9a924f44159f7369ecb900c789d15d6b4 SHA512 8486f6f701abf48abfdcf1ed30d95b4bde8be46fab6f31313394ffe4a5ee99fea7da8f4d20a174954d2038fd369b0837f6677c53a8453ef3e137cd1dd415009a -EBUILD qdmr-0.9.0_alpha2.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db +EBUILD qdmr-0.9.0_alpha3.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db EBUILD qdmr-9999.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70 diff --git a/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild b/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild index d80ff7599869..d80ff7599869 100644 --- a/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild +++ b/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index e5576088f5cc..d6493e8990af 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -2,9 +2,9 @@ AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a6 AUX uhd-4.0.0.0-boost-1.76.patch 2412 BLAKE2B dec44ca0a3e743627c9d68f822623b16325c0829df96e513b9096f3ff03d949fe61a6d5975c302703c178dd0e5090807f4d4c1fa299ce45f5507fa19d23fee4d SHA512 29f554ee4ad1340e0652a6e697340b27f6aa5b1a750c2d67c6068db5d995f325662f13090ec92f7c3e3120f4b4f70690e439fe1884076e083dac5f2cbb1c1681 AUX uhd-4.0.0.0-tinfo.patch 2163 BLAKE2B b1575290096e85c107772963deaed3f85b8612ad1e1b7b8a800e01d036822e18866cb35249321ad27cfe1c90291894463f0186692f8c20ca8f6ae2242301cc0f SHA512 289c720f465a78f20626c5b17605fe06f33634f225cd3d84834a6fb46448d5e11812fe5997a07141f87f014abb26e3d08afdba0c36335f7640c5db290269439c DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 -DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd +DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033 -DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f +DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b EBUILD uhd-3.15.0.0-r100.ebuild 3782 BLAKE2B 8d34e440265462624ab04b6106e7bcc44e855a8da6aa278b784fb873e852a1592c37035f6f2376aff16c2fc724658278fb28aec37d0ec60960c6ef40c141853b SHA512 9d01069eee1a35e81bef70e4261f56b011ff7b10904e598f8ae85f48418a9f97d4acb0c23c3b230880299c896abb93f94e9df461d0c2f63fe515fd1be64db1ba -EBUILD uhd-4.0.0.0.ebuild 3718 BLAKE2B a4a2c28e9c9e49ce3e50da41ae0d6390daeba6b1894f0c110ffc85c66aa7f27015e96b5db5aa21a4c38cf023a503a68e3384a8d1c52c6c02dd081503ac93b762 SHA512 648ccbadcd35c4baa0d8c3f2663e306c9b8f9ebbf46ca96c1fe35ffef9ea829e6a7a9df7b5f91e090d94f9cc26a87d7b537213cc9c61a08fca535471c50d928c +EBUILD uhd-4.1.0.4.ebuild 3672 BLAKE2B 8c2789803925d42bcad7ff54f5daa1766ce17c828b5d3c8050c535d71d158e9ca2fab66677d450201a2dbcf3509f80a4801d42200e052d3e6940987fab3398b3 SHA512 294f1c61407bbc17a8c2dfc3f725f80a2741a0a79f528626874df759a6378e51fd116da4555a3bb30764b6794e9e029df3d9206b52a3839d691677e4e5187c76 MISC metadata.xml 1160 BLAKE2B 0bcd5e0ea7008a4847cd0ec47e900eaad894c1b37f9917197ed408edb6525f3526fce2086fa318d66f9fe3a355a8a3d5b92dcdffd2518439fb4813f9cdec5b8a SHA512 b53864ec397c266c6c914c9d7bf44eb30187585fac7d5c871b54e91e7909186c756bcd49850343a28093e77148b506bbab5583834a0a125cefe9280c2e324c4d diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild index c93dca6d407a..e74d51a15c92 100644 --- a/net-wireless/uhd/uhd-4.0.0.0.ebuild +++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild @@ -50,7 +50,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" - "${FILESDIR}/${PN}-4.0.0.0-boost-1.76.patch" ) S="${WORKDIR}/${P}/host" diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index 858b04dc6b24..e570e99cb82f 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -4,7 +4,10 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9 DIST unifi-6.4.54.zip 158992649 BLAKE2B 90f98b1349a5fca3e6d85ef42823c5beaff0a3ac4697622a0387259421fdcfa891b094acb66f798a97b4397a27d477d6fe10d53bed03e15081f4d63abafb9d8e SHA512 d0502f87fe6827cdfabbffce7c7b0159aaad2ac032b59d04d5f233ada279fb90d5e21e043de518260c3380c7e23ff561f04040433a441866421dbe9b2db540c0 DIST unifi-6.5.42.zip 161190627 BLAKE2B 9eca9169167ce09b27925e02d0ae9a7e96748be7821a920ca438c1ae76ddb7d45547c97b0066a22e66accbfd59a2a40e981ef772a4266c53c4630d1e36ca50dd SHA512 bbbdc046eb1a1e59c0d030c048fba268e1673053de9d8efed1c085a71b376ec2fc0840d08e6f226648629b1370fe9ea7bab147a7584e3fb32fc44d10bf791b86 DIST unifi-6.5.45.zip 158061910 BLAKE2B 16b24ae67c9c649c5b7b008afa3b503dd5492e6da45107ac1be81707940623e20d111a350c32dae45a11a5a53de041b8e6b60f246af509b00bf933e36a1e9002 SHA512 ab408506055cbdca5e3f2bb7ca8bfbd4106e57621f8d741b789dba983dcd65f126435d40a5995e453ebfabaa32c3d493940bc5115c344d9f29c8ae10f265b850 +EBUILD unifi-6.4.54-r1.ebuild 2226 BLAKE2B c856925f1e2c086190612c425255a5a276413c1c377d2f6593f5195cf34503ca43c5dc65faf71acd86aae63f05e6925a93cc775d4505cec5aaa2d0e5aaae303b SHA512 879ba8af6b1fa0cf9f264cdbdc297261371e99c9aa95271542a923a3effbd4aa3d65b761dbbed3adcc66112539ee8df89508abda753e74a518e1f203d933e0ba EBUILD unifi-6.4.54.ebuild 1576 BLAKE2B 0bec65374520f4f332ba0235559346e7c5cc5c6f010ce7a3d633f47ebc3416f8427cdf0ed864f2e313cf4cdc2cbc01d944adb2ecec2762c90929e57292929609 SHA512 f4d31f319708b44357e0b105aa9dcf1c4ae73885f37ea985d2dd2c2ad87df2ea7b07e4ab6a536aa742ba1c39cf841a2c04368b36c03ad08c1e67af4b96f70dbd +EBUILD unifi-6.5.42-r1.ebuild 2226 BLAKE2B 9f729d765309b749032f1472259da77ee3e2484d5118521643dd8503a1a7af68a7046c27600bd28f5f31f3dcf2453531c38cef7f7d79e240745899e76329404d SHA512 d12064dc68ace830329eec8c1bc8da74853f0ece11a5d1c651f41b65121529cce0937d0cf52b116060844aceada60d76c8ad230ca1f9c8894e16f5b452e18938 EBUILD unifi-6.5.42.ebuild 1577 BLAKE2B 94b07baf3cb368d0a66766f6c8d7acc2f103480f908819c5530c127d32e60183999107f05a34cfb25a499089a5a021499426c2ec9929966d6b3c5cf0913ed78a SHA512 85a0fd9cb3274dda3597c6b36844ce0c44fad7f3d838fdeec283a84444b574e8e005ebeb6ddab6e725bfe16e8865f9a17443e7e5154162cc98552eef6b31d90e +EBUILD unifi-6.5.45-r1.ebuild 2226 BLAKE2B 7e5ecdeb913606a5df706bff8edacedb0048d43bb48f5163aa29d915b40be54d8ec49895d4f091055e13eedb8c3e7376151c811e57d25db6119576cbba49f9fd SHA512 905e24eebcd72bf5d639a45cc446e9a5adcb646dda482a33f85c2f19985fd2bfe30f032c4fa6ceeb1f2b239be074dd4df1a44398483236450a5a4a5e75944a2c EBUILD unifi-6.5.45.ebuild 1577 BLAKE2B d3d42fc99457eae53e204ca93502921bc3e59f42923c763c780fdf406e57a1c427284759894616f01ef38cc5f0ebe6781461a10cd07726372b6a745d0c4019e2 SHA512 12a10d63186ed48b127bfaea531b7cb1fd083aac18aa51e6133f00fe6cb114aa59b823cdf0235ebf0cec543c02988fbedc34e30af354275c837b606b19b08fdd MISC metadata.xml 684 BLAKE2B 3c8638e2b38691bc33fd9c9cb8a79bb9b7421ec5f6d01cb6411f8cfdf8451b37855662c6e9e0dd519eda4a08b0c8e7543c2f358bf78a9dc41d52ba0cf7664600 SHA512 2f5bc4a8d9ecc37c85c6685aa1f201678a0f1236d65d8f1c72137a4ffb03ed82ed0d44c6c7231405467f77b5dbcfb375477c8cb0c0a6d8924bac822391fc2f3c diff --git a/net-wireless/unifi/unifi-6.4.54-r1.ebuild b/net-wireless/unifi/unifi-6.4.54-r1.ebuild new file mode 100644 index 000000000000..091b58c0e924 --- /dev/null +++ b/net-wireless/unifi/unifi-6.4.54-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Set this var for any releases except stable +RC_SUFFIX="-bdf9275f33" + +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 ~arm64" +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/$(ver_cut 1-2)" +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 Mac and Windows + rm -r lib/native/{Mac,Windows} || die + + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" + fi + if [[ ${CHOST} != armv7* ]]; then + rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == armv7* ]]; then + if ! use systemd; then + rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + 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.5.42-r1.ebuild b/net-wireless/unifi/unifi-6.5.42-r1.ebuild new file mode 100644 index 000000000000..dda4cf11fedd --- /dev/null +++ b/net-wireless/unifi/unifi-6.5.42-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Set this var for any releases except stable +RC_SUFFIX="-7bfe5b2ead" + +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 ~arm64" +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/$(ver_cut 1-2)" +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 Mac and Windows + rm -r lib/native/{Mac,Windows} || die + + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" + fi + if [[ ${CHOST} != armv7* ]]; then + rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == armv7* ]]; then + if ! use systemd; then + rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + 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.5.45-r1.ebuild b/net-wireless/unifi/unifi-6.5.45-r1.ebuild new file mode 100644 index 000000000000..737b3c88d17b --- /dev/null +++ b/net-wireless/unifi/unifi-6.5.45-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Set this var for any releases except stable +RC_SUFFIX="-c8122c1151" + +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 ~arm64" +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/$(ver_cut 1-2)" +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 Mac and Windows + rm -r lib/native/{Mac,Windows} || die + + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" + fi + if [[ ${CHOST} != armv7* ]]; then + rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == armv7* ]]; then + if ! use systemd; then + rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + 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 +} |