From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- net-wireless/Manifest.gz | Bin 14917 -> 14924 bytes net-wireless/iw/Manifest | 2 +- net-wireless/iw/iw-4.9.ebuild | 2 +- net-wireless/yatebts/Manifest | 8 +- .../yatebts-4.0.0-dont-mess-with-cflags.patch | 13 ---- .../yatebts-6.0.0-dont-mess-with-cflags.patch | 4 +- ...bts-bladeRF-transceiver_revert_init_order.patch | 86 --------------------- net-wireless/yatebts/yatebts-6.0.0.ebuild | 15 ++-- net-wireless/yatebts/yatebts-9999.ebuild | 15 ++-- 9 files changed, 25 insertions(+), 120 deletions(-) delete mode 100644 net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch delete mode 100644 net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index 3f12ac487b38..d7d86b0cedb5 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest index dff2e40a7329..c6b255c222d5 100644 --- a/net-wireless/iw/Manifest +++ b/net-wireless/iw/Manifest @@ -9,5 +9,5 @@ EBUILD iw-4.0.ebuild 753 BLAKE2B 0dcafdc4d190d6786d32ff487056184789d60745d1e7ab5 EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5aaa5ed49b128b480ec8253968fccd671feb683cf9d4e858ce2c8c64c135ef7c636845b63a45fe0dc71 SHA512 33b81ff5cbf786b406a759dd2b72d8e914c805df99d442c07bbf79723be063608ddab0851c3728862ef71e4d37b7baeb4b1a8b560836f4f4e93eb65c628e5d1f EBUILD iw-4.3.ebuild 755 BLAKE2B d9c359eb34d37efc6ef28f44aea898bf6d89e622c4db6fe206b2d04c2c40d543954498df913fa43c3ccd47338b1bb07290c91045e4a29f83d95b092e43443227 SHA512 46429aae6cc69881d3a1320df9e11f28c5e01d010839b99cab83c5f455ed986b4972c698f71c72b9063b3475be062bc7e05e8dd64de18727bf5978b75e165fa5 EBUILD iw-4.7.ebuild 762 BLAKE2B 417d038aa7efece0cfd2dadeb4bdfc7fb10834053d1e4a0c72706c69deb06b8ba0210e663ff7b0c3ce48358e77a1df80992b2277d567ea76f689979a1d35c84e SHA512 4788121468e574ed343a9a8f781c3e83d15fef389661ffbf17032f29ba984e1bff46f837ec30cedbbb3f52ffaea558ed1794357bbde49be7384546acb5ec7d72 -EBUILD iw-4.9.ebuild 765 BLAKE2B d52ff652631f5d1e44ccf91be80a0d6c003c87ca428e1d0528e5ff6c171ae03a64729fc1cc9408273c764c5966d8e75d51e1afd0480ccfc78f611c0134968347 SHA512 1382af4eb88e1124250528b665f0bedde46e5c5331e23e1fa71db4d89a43b13d738b209be17d35343c990288c24fb2b5e5b556180e8e75c524db7c1495e8d53d +EBUILD iw-4.9.ebuild 764 BLAKE2B e8fc3877f5f708350de7dd4ecb9bc457f066e898d8a30580842e13f651af755e1911d05ef695f3ba7ab9ebd98974788a5ada1ae793ef17a221b2ff44dd2a31b9 SHA512 c5e3fd7b855b8d3fcb5613e793f0278036fe1ebee2c40a41dc6aa9bddaf9176e3d8cb2d26fb951f721fdb5acfbc5ef1e6e85e0c9983b2c54cf69e74ae8493d0f MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69 diff --git a/net-wireless/iw/iw-4.9.ebuild b/net-wireless/iw/iw-4.9.ebuild index 7251381c6a9b..44211fbfd919 100644 --- a/net-wireless/iw/iw-4.9.ebuild +++ b/net-wireless/iw/iw-4.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz" LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/libnl" diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest index 01d4faa02b56..e9978a882709 100644 --- a/net-wireless/yatebts/Manifest +++ b/net-wireless/yatebts/Manifest @@ -1,9 +1,7 @@ -AUX yatebts-4.0.0-dont-mess-with-cflags.patch 434 BLAKE2B 132c4fd0fbd52257d662651f269d70cb541227462b0faa8bf3f0ccfdcd11e20058a7c44ee0b4b90cc163e961795749e61fec6efac5859ed0dbeb88933177f287 SHA512 9a8ce2aaaa3e5183a4d77b4ece5f53d71b2c1c59856d1f3054a8a552a547624585674f8d67cc068eb6546279a87a14e8471d99ca79fc7025c989e94aa03a3d25 AUX yatebts-5.0.0-gcc6.patch 1125 BLAKE2B 20d2fa8431238c888d5841c6895a84b7fd2b914f6fdc22238b12f78b1758ffeb810cf0d37bb917439b6098c78f7fd141fbf2e6442eed5da4fb2a2a7b34afc4d8 SHA512 e2a575d1e4a31f884b2af95439ce077a811d655cfcb646b20652638a353a9e730999134128003829a538b880ca07ea23e125a9b21073e46a7aae05b1eeb9baf1 -AUX yatebts-6.0.0-dont-mess-with-cflags.patch 364 BLAKE2B d6c492f4355c0a0922dc15980c868f0100a856b436c638482db9beb69afcd1007d814d45a5936dc98108e90e6b65743ea140b0c933d4da65d4107c28c4d4ecf9 SHA512 d09131c6948ec78cbbad45fe4a3de868ef0cff7a0d70bbbd5af2d6e91d6be4d90ef1674b81b24d2c90b35c0d5e68bd3d2059fa5bbbfd37d9cc46da53097617cf -AUX yatebts-bladeRF-transceiver_revert_init_order.patch 2636 BLAKE2B ac1175836fdf844c93075003231d2a3092ad047a52b7bea5130e3bac622a5bc1b16aae85cc2cdda919adc2e031affc719752503c80e94e297314dbbb46a61150 SHA512 30e59e6e6f565c74d2ed15c70aee09c783cc710701de3b2d5e2f6530486dcde0dc63b03e4475d8e525e83e6612b13015e5d901e76061394afb6179987f3efa80 +AUX yatebts-6.0.0-dont-mess-with-cflags.patch 291 BLAKE2B 034044f86ad35888b63046731cfc147c856bdb7ca091ad3e2b8518fe0d5918ba6e6ee4478fd6ea0c24c437ab62cfebe450d01ffb1a9d88d1bd691aca1208db37 SHA512 baf8f4dd564d099efc17fc1f9d0dd8f7c7b774420c851ee2e9d11a227eb8d624a95e8759977cbd6301dc6804d42942f9c62000b3b568f20261630797063181b8 AUX yatebts-sgsnggsn-inetutils-hostname-fix.diff 487 BLAKE2B f7d2b114259363c4eba833ac74185545678bba67db709abf2e097aec308e3aba1312ca6f35a78ab3e6ebc2f422ab397c81806b7e7ebdd78f3f27b1e11164205e SHA512 55a9ad165e00e8c9b5556c1f29e244286d3cdf425cdb94f1a3e49c1d27962c302bedbbec37e5ce4ce44867b7bd17587887dfe6cfd5fabffdba32066799bd86c6 DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7 -EBUILD yatebts-6.0.0.ebuild 1246 BLAKE2B c9bc84591599270066c583f6b64f63db2c6fdbef2ec90e3a7cc55dd8ae39d8ca5c1b35669aa6a64df341b24038d0ab823e89d605b807b33f500c3bfcca59d545 SHA512 8de85b680b9dce174e70cd87b2a3229f8adca88e2717587448c4e3f410fcfcc30da774e810155e77e1061ea871c0ddc0653843464512d96cadad6279c846fec1 -EBUILD yatebts-9999.ebuild 1246 BLAKE2B c9bc84591599270066c583f6b64f63db2c6fdbef2ec90e3a7cc55dd8ae39d8ca5c1b35669aa6a64df341b24038d0ab823e89d605b807b33f500c3bfcca59d545 SHA512 8de85b680b9dce174e70cd87b2a3229f8adca88e2717587448c4e3f410fcfcc30da774e810155e77e1061ea871c0ddc0653843464512d96cadad6279c846fec1 +EBUILD yatebts-6.0.0.ebuild 1227 BLAKE2B 46a3c957081817aea769cfc442f87ba9fbd98f8850cb9db52082f911ff5778dde83ab29eead75c7eb22fe58345042243bc2ae16d0842685a0201e2db1cb4a405 SHA512 0da80223ce4a8ec68a6523171ff3894bd93e145c3fec4cfdf2cac4afb4db41f4ff9dc3a72df4057b85ed186cddf13d325c87f7916a9ebb6ac341025f5760ad2e +EBUILD yatebts-9999.ebuild 1227 BLAKE2B 46a3c957081817aea769cfc442f87ba9fbd98f8850cb9db52082f911ff5778dde83ab29eead75c7eb22fe58345042243bc2ae16d0842685a0201e2db1cb4a405 SHA512 0da80223ce4a8ec68a6523171ff3894bd93e145c3fec4cfdf2cac4afb4db41f4ff9dc3a72df4057b85ed186cddf13d325c87f7916a9ebb6ac341025f5760ad2e MISC metadata.xml 459 BLAKE2B e4a03862c2298c785666d3a38a642840831781f99a8e0bf196d8a91012ccbbae187b1c9b5e7d0c4d33de68bf06929ecfa4929431b551da759f1fe88be17aba1a SHA512 e5cb7b858684817bfc6f4ce03dc6ad7c3743d649d96dc8bc2c68aa663a834593cb81081d72e7775bdafed38c932684985e37a7af82c39bd38d72e01dd8b30b60 diff --git a/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch deleted file mode 100644 index b10eb57237ef..000000000000 --- a/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur yate-bts/configure.in yate-bts-sane/configure.in ---- yate-bts/configure.in 2014-07-25 10:28:44.000000000 -0400 -+++ yate-bts-sane/configure.in 2014-07-25 17:38:23.550069064 -0400 -@@ -36,9 +36,6 @@ - AC_PROG_CC - AC_PROG_AWK - --# Delete -g as we handle debug info at build time --CFLAGS=`echo "$CFLAGS" | sed 's/-g[[0-9]]* *//' 2>/dev/null` -- - # Helper to check by pkgconfig including local paths - function pkgconfig_check() - { diff --git a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch index c6827eb90952..8768164cfa63 100644 --- a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch +++ b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch @@ -1,5 +1,5 @@ ---- configure.ac 2017-09-07 10:21:08.000000000 -0400 -+++ configure-sane.ac 2018-02-16 15:26:43.884257256 -0500 +--- a/configure.ac ++++ b/configure.ac @@ -38,9 +38,6 @@ AC_PROG_CC AC_PROG_AWK diff --git a/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch b/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch deleted file mode 100644 index 83da1d58d29d..000000000000 --- a/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/mbts/TransceiverRAD1/bladeRFDevice.cpp b/mbts/TransceiverRAD1/bladeRFDevice.cpp -index a2a3346..cfdb977 100644 ---- a/mbts/TransceiverRAD1/bladeRFDevice.cpp -+++ b/mbts/TransceiverRAD1/bladeRFDevice.cpp -@@ -35,7 +35,6 @@ - - #include - -- - #define MIN_OVERSAMPLING 4 - - #define HEALTH_BAD 10 -@@ -128,7 +127,36 @@ bool bladeRFDevice::open(const std::string &args, bool) - << "." << ver.patch << " (" << ver.describe << ")"; - - uint32_t val = 0; -- bladerf_config_gpio_read(bdev, &val); -+ -+ status = bladerf_sync_config(bdev, -+ BLADERF_MODULE_RX, -+ BLADERF_FORMAT_SC16_Q11, -+ DEFAULT_STREAM_RX_BUFFERS, -+ DEFAULT_STREAM_SAMPLES, -+ DEFAULT_STREAM_RX_XFERS, -+ DEFAULT_STREAM_TIMEOUT -+ ); -+ -+ if (status < 0) { -+ LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status); -+ checkHealth(mRxHealth, false); -+ } -+ -+ status = bladerf_sync_config(bdev, -+ BLADERF_MODULE_TX, -+ BLADERF_FORMAT_SC16_Q11, -+ DEFAULT_STREAM_TX_BUFFERS, -+ DEFAULT_STREAM_SAMPLES, -+ DEFAULT_STREAM_TX_XFERS, -+ DEFAULT_STREAM_TIMEOUT -+ ); -+ -+ if (status < 0) { -+ LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status); -+ checkHealth(mTxHealth, false); -+ } -+ -+ bladerf_config_gpio_read(bdev, &val); - val |= 0x10000; //enable timestamps, clears and resets everything on write - bladerf_config_gpio_write(bdev, val); - bladerf_config_gpio_read(bdev, &val); -@@ -185,34 +213,6 @@ bool bladeRFDevice::open(const std::string &args, bool) - else - LOG(INFO) << "Actual bandwidth " << bw; - -- status = bladerf_sync_config(bdev, -- BLADERF_MODULE_RX, -- BLADERF_FORMAT_SC16_Q11, -- DEFAULT_STREAM_RX_BUFFERS, -- DEFAULT_STREAM_SAMPLES, -- DEFAULT_STREAM_RX_XFERS, -- DEFAULT_STREAM_TIMEOUT -- ); -- -- if (status < 0) { -- LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status); -- checkHealth(mRxHealth, false); -- } -- -- status = bladerf_sync_config(bdev, -- BLADERF_MODULE_TX, -- BLADERF_FORMAT_SC16_Q11, -- DEFAULT_STREAM_TX_BUFFERS, -- DEFAULT_STREAM_SAMPLES, -- DEFAULT_STREAM_TX_XFERS, -- DEFAULT_STREAM_TIMEOUT -- ); -- -- if (status < 0) { -- LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status); -- checkHealth(mTxHealth, false); -- } -- - mRxGain1 = BLADERF_RXVGA1_GAIN_MAX; - mDcCorrect = true; - mRxMaxOffset = RX_OFFSET_ERROR * RX_AVERAGE_DAMPING; - diff --git a/net-wireless/yatebts/yatebts-6.0.0.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild index 8dd83f84e584..cac2e275abd1 100644 --- a/net-wireless/yatebts/yatebts-6.0.0.ebuild +++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild @@ -3,10 +3,10 @@ EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="The Yate GSM base station" -HOMEPAGE="http://www.yatebts.com/" +HOMEPAGE="https://yatebts.com" ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk" LICENSE="GPL-2" @@ -30,11 +30,14 @@ else S="${WORKDIR}/yate-bts" fi +#we need more patches or configure flags because things install in really wrong places per FHS +PATCHES=( + "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff + "${FILESDIR}"/${PN}-5.0.0-gcc6.patch + "${FILESDIR}"/${P}-dont-mess-with-cflags.patch + ) + src_prepare() { - #we need more patches or configure flags because things install in really wrong places per FHS - epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff - epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch - epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch default eautoreconf } diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild index 8dd83f84e584..cac2e275abd1 100644 --- a/net-wireless/yatebts/yatebts-9999.ebuild +++ b/net-wireless/yatebts/yatebts-9999.ebuild @@ -3,10 +3,10 @@ EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="The Yate GSM base station" -HOMEPAGE="http://www.yatebts.com/" +HOMEPAGE="https://yatebts.com" ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk" LICENSE="GPL-2" @@ -30,11 +30,14 @@ else S="${WORKDIR}/yate-bts" fi +#we need more patches or configure flags because things install in really wrong places per FHS +PATCHES=( + "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff + "${FILESDIR}"/${PN}-5.0.0-gcc6.patch + "${FILESDIR}"/${P}-dont-mess-with-cflags.patch + ) + src_prepare() { - #we need more patches or configure flags because things install in really wrong places per FHS - epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff - epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch - epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch default eautoreconf } -- cgit v1.2.3