diff options
Diffstat (limited to 'net-misc')
23 files changed, 29 insertions, 713 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex bfca63ffa8b1..d3681693dd42 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index e85e6621cfd6..393d873d3df1 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1,4 +1,4 @@ AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 -EBUILD cadaver-0.23.3.ebuild 999 BLAKE2B 52b1b4fc1f9882055ba3f2aae4841ab2973fc6508e3385d641011de01688bb2f6b6684b22c9a0e0c6d69d28c7abca7b537d4d759729d62bacbd4ad7c34c33583 SHA512 79c57dd71459c6b2ddfc8cc285b4f552130ed27269f6b6f9fdcc70a565aa7a40aa28762f2cd6b0f3ff268d5d9ab41c20f452bd89499ccfb70dfc1800a46355b1 +EBUILD cadaver-0.23.3.ebuild 1073 BLAKE2B dc2af096996fafb295055cf9843465c323ce5f04b97a42e7d2fc201c8ef34c5ca93c28c97723a3671abc968fec9adec094a69d0c9c812c3afde8857edf3952b4 SHA512 217e5a20da9bea6e7eb099b61b33447ef074596d53e45d0318712771596c00adda66e0546e1f15e9067c25b51a842697451219e4b843ab06b428f98f619156ae MISC metadata.xml 338 BLAKE2B b00867702effd06d43020a0a3f5962d8aa1ae94197580af3d08c43458e0094f9967abdaa8f3cbf204d14c31c9ee37b31151cd05926978f18dc3344b52c2ca397 SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749 diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild index edb1d0379d7a..c329d370cd88 100644 --- a/net-misc/cadaver/cadaver-0.23.3.ebuild +++ b/net-misc/cadaver/cadaver-0.23.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2003-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -26,11 +26,12 @@ src_prepare() { rm -r lib/{expat,intl,neon} || die "rm failed" sed \ - -e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \ - -e "s:lib/neon/Makefile lib/intl/Makefile ::" \ + -e "/NE_REQUIRE_VERSIONS/s:29:& 30:" \ + -e "/AM_GNU_GETTEXT/s:no-libtool:external:" \ + -e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \ -i configure.ac || die "sed configure.ac failed" - sed -e "s/^\(SUBDIRS.*=\).*/\1/" -i Makefile.in || die "sed Makefile.in failed" - cp /usr/share/gettext/po/Makefile.in.in po || die "cp failed" + sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" + cp "${EPREFIX}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed" AT_M4DIR="m4 m4/neon" eautoreconf } diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index c0c05dce6f49..c8edcdb6d633 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -8,5 +8,5 @@ DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd5 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91 EBUILD electrum-3.1.3.ebuild 4324 BLAKE2B 982bf508f73e8dba14667d04e49c3af84e04c2c84624bfae7698ce265d3b09246db987e1da9e8887266c1d77e0a575104d489de97719ddf71cd3d390f359768a SHA512 8620a4eb41aedc875f3315fad410489b96d9ffbf1477cd91d6ca34385c12719e4fefb56eb9a5d1700d5c99001340a080af96fd3ddfffa3970bd9ff311934c39b EBUILD electrum-3.3.4.ebuild 4642 BLAKE2B 02a2f998591557da446f1d9be0db24742764ddb3e22af518460281fde6f6cd8ce1ab0308aaae9f4d6247705e5aa05c21ec7067d7ca8548cf8461da47445b9706 SHA512 770bc4dff7fee5bf2508ab2c58f346f0bdb767fde0d26d8de61ede13b617b96a2d7cf8859925acaf84270dfd00cfe8811adb455519717e35b31f03be4ca48048 -EBUILD electrum-3.3.6.ebuild 4642 BLAKE2B fa910e649d20976822159e5221e29a311545825c3577eea1c5232738031a1229d353c3f584d0441bc2a957ca53dbbb169765e313c5739e4ae77a5b2c8b4acd71 SHA512 02904da5ec4338107061be342fc0675001cb51565f6da639d6669c7fabad399e1260e44085a3072bc34647b3055a768abdee47c648cfbce0311f602239cd9205 +EBUILD electrum-3.3.6.ebuild 4650 BLAKE2B bb191b6005932f5964bc3d8ecf69ab5fd67e1a1751bdbb064731a300fb8ca5b9c70ffbaa3cdbf6973e9bdce6e5e1e04d47cab46f2b47fa5c55646db3c23958e1 SHA512 e0273dab1f9a63e1be93619fa69b5256895ec712d72cab27c45a22be4fc8602f9a087e9176edc7e6c0b957e7a7154e3baa64fc4a8e79b8d535a1bd0d63811d92 MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02 diff --git a/net-misc/electrum/electrum-3.3.6.ebuild b/net-misc/electrum/electrum-3.3.6.ebuild index 7aad1b5767fc..b664a9d69b27 100644 --- a/net-misc/electrum/electrum-3.3.6.ebuild +++ b/net-misc/electrum/electrum-3.3.6.ebuild @@ -48,7 +48,7 @@ REQUIRED_USE=" RDEPEND="${PYTHON_DEPS} dev-python/aiohttp-socks[${PYTHON_USEDEP}] - dev-python/aiorpcX[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] dev-python/jsonrpclib[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest index 9197f18a438e..d111f5fc72b1 100644 --- a/net-misc/endlessh/Manifest +++ b/net-misc/endlessh/Manifest @@ -1,12 +1,7 @@ -AUX endlessh.confd 822 BLAKE2B d7f7810d80dfdf6d7f71119304b161d82ddc1852e76084a5bff494111c0a7b53aae34cbc9eb63300ff7eb02aa01da393e50b5b38551d8e355527e687a3a3d941 SHA512 d8e83846e7adff478c4cb2f238a8363cec54c43cb6fb25445f88fdba256b35c60cce71b546354667d411cb8b08421533f2e3b35a9136243d09bd66c2b7e1d0f3 AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d6e03f2dcb8dda4ac8e9394b40aec1acd6ed082d0d4bdbd8fa553793bca10791faa7c99994625dd1f51a SHA512 8f54abdd8d4f63153ed1b1653b52d2e2c4a97b68851a9e8c882e7a0ff6c235300b74ca9803c0eb8402c5c4e6d17977ce77860fa5101d7925ff5004cffca92304 -AUX endlessh.initd 467 BLAKE2B 008886697a897f0ed3ea6a58c5d3b805364cbfa7084e7b871e5acfe27d3078434254c3da95ae31398598662521ad456377fc31160a2e00f3afbd7c0308a8948d SHA512 c0e2133d4edaf09af46fb739b89ae066c773300e48f9de82ec54eeec116e239c568342200cf250773eefb69765c8fe6ae508ff7643f3a15a26a6a7ec6ccdada6 AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48 -AUX logrotated 133 BLAKE2B 56d8c2e32bdae751326a8cf22f5369abda80df8478001398fcb8675fb5ac257beed06a13894ffd713606ca4697068becd36916bbe058e2c45c5b70c724d30673 SHA512 4ac4c0bbaf7658a844ace9727cfa459716f67c6f5705f5ee3b21c01fe5a21ed4083ed4b40966c3ec5392cb5d6491b0e3480bef18b1b4afd1dd10fd9e1052411a AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad -DIST endlessh-0.1.tar.gz 8566 BLAKE2B e8fefd6ef80d26c25f57ffe1cef502af05322e348d63ca17c0bb626e35d5c1d35cb98384b35c86c579f2876573f4c13468605c3f44325a48d19e27c499657853 SHA512 0d11c82a708a26bd77ca85f7f3bd0eda2807ded9de88e3e518da09a38b3e94fc2658ea6f210e4f1493d38ca5948968c5488c8f2f09ff2adf22b799622b4952b8 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8 -EBUILD endlessh-0.1.ebuild 1316 BLAKE2B 8363adff4cd74f9d4dad3b767da1740d6d4a899e574e9aeb44302a9362f42d4d5f84246dc7b631a563bad75030c8971800b31b4c78553eb3e64574b26e5c9e86 SHA512 040568eff0cb04c7a5158aa8c8dd0e653cfff19bb69f43649cbc0efc7017260bd0335794a94b1094f8dc9e363bedf6ef09f2184ea014cbd7565f566ba7da66e3 EBUILD endlessh-1.0.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42 EBUILD endlessh-9999.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42 -MISC metadata.xml 1075 BLAKE2B 5ec84e340815f31671568a185d52e217d4b5818f3a1a1f64860c35e484ca5f8d08d714d8eea5111c6eb8067845a537a8271864e68713c889fc22d7c4024fee30 SHA512 1d63706f79e1eea43482dd83d9b0e11cb2b0693fd9ebf39f9d3f2427ecf8d081800d9861965b4eb6428f54f35c6d58c9eeeba952edb610c10f842ce5bb326ada +MISC metadata.xml 931 BLAKE2B 0796a43cb19ba6da07434a782da24ab45e216a547042c598c9c7e090e5ceaffa7a69ddbe4e3466eeaf7e4d14d0bb3b8457d0db45b74d675f31a17bad281b1a7e SHA512 adeb45ea9169f3c9c52e2131ea51b2b357c3f036edc28baa1fd312ab58313d4208cfd75f01fa39e2fd045d6587d9167a76e530245c0d650a27c50fcf2c2e3410 diff --git a/net-misc/endlessh/endlessh-0.1.ebuild b/net-misc/endlessh/endlessh-0.1.ebuild deleted file mode 100644 index 105c786b1013..000000000000 --- a/net-misc/endlessh/endlessh-0.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) - -inherit python-single-r1 systemd toolchain-funcs - -DESCRIPTION="SSH tarpit that slowly sends and endless banner" -HOMEPAGE="https://github.com/skeeto/endlessh" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/skeeto/${PN}.git" -else - SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Unlicense" -SLOT="0" -IUSE="tools" -REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="" - -RDEPEND="${DEPEND} - tools? ( - ${PYTHON_DEPS} - dev-db/sqlite - dev-python/pyrfc3339[${PYTHON_USEDEP}] - ) -" - -BDEPEND="" - -pkg_setup() { - use tools && python-single-r1_pkg_setup -} - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's/^CC/CC?/' \ - -e 's/^CFLAGS =/CFLAGS +=/' \ - -e 's/ -Os//' \ - -e 's/^LDFLAGS/LDFLAGS?/' \ - Makefile || die - - sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ - util/endlessh.service || die -} - -src_install() { - dobin endlessh - - newinitd "${FILESDIR}"/endlessh.initd endlessh - newconfd "${FILESDIR}"/endlessh.confd endlessh - - systemd_dounit util/endlessh.service - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotated" endlessh - - einstalldocs -} diff --git a/net-misc/endlessh/files/endlessh.confd b/net-misc/endlessh/files/endlessh.confd deleted file mode 100644 index a114889c8cac..000000000000 --- a/net-misc/endlessh/files/endlessh.confd +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh -# -#ENDLESSH_ARGS="" -# -# -d INT Message millisecond delay [10000] -# -f Set and load config file [/etc/endlessh/config] -# -l INT Maximum banner line length (3-255) [32] -# -m INT Maximum number of clients [4096] -# -p INT Listening port [2222] -# -v Print diagnostics to standard output (repeatable) - -# EXAMPLE: listen on port 22, log all queries and errors in very verbose mode - -#ENDLESSH_ARGS="-p 22 -vv" - -# plain file (preferred), change logrotate file as well if you change this. -#output_log=/var/log/"${RC_SVCNAME}.log" -#error_log=/var/log/"${RC_SVCNAME}.error.log" - -# syslog support via LOGGER(1). Note this spawns logger processes per io stream -#output_logger="logger -p daemon.none --" -#error_logger="logger -p daemon.err --" diff --git a/net-misc/endlessh/files/endlessh.initd b/net-misc/endlessh/files/endlessh.initd deleted file mode 100755 index a88fd9c34c90..000000000000 --- a/net-misc/endlessh/files/endlessh.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -description="Starts endlessh tarpit" - -command="/usr/bin/endlessh" -command_args="${ENDLESSH_ARGS}" -command_background="true" -extra_started_commands="reload" -pidfile="/run/${RC_SVCNAME}.pid" - -reload() { - ebegin "Reloading ${RC_SVCNAME} configuration" - start-stop-daemon --exec $command --signal HUP - eend $? -} diff --git a/net-misc/endlessh/files/logrotated b/net-misc/endlessh/files/logrotated deleted file mode 100644 index 53c9efbfe873..000000000000 --- a/net-misc/endlessh/files/logrotated +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/endlessh.log /var/log/endlessh.error.log { - missingok - notifempty - postrotate - /etc/init.d/endlessh -q reload - endscript -} diff --git a/net-misc/endlessh/metadata.xml b/net-misc/endlessh/metadata.xml index 10db1a22fbfe..98a449ec2b7c 100644 --- a/net-misc/endlessh/metadata.xml +++ b/net-misc/endlessh/metadata.xml @@ -17,7 +17,4 @@ <upstream> <remote-id type="github">skeeto/endlessh</remote-id> </upstream> - <use> - <flag name="tools">Install additional python script which can be used to parse logs and save summary to sqlite database</flag> - </use> </pkgmetadata> diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index f66e594f5ebc..ca3237ba4b0e 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,5 +1,7 @@ DIST mobile-broadband-provider-info-20170310.tar.xz 85016 BLAKE2B a43312e1772fc59205be1bbf7d6f80518ff0edf0719d48e60013c3acada4c05a29043567695896641b32c477ddab2ca6da379e1b7a4436d977ccc68f4e247f09 SHA512 24d8d8bb202f0893bea105420d38156ff8de311eac71e969524961e723ed3d1f9994ec98efbace62dc0ac3859c7a4b316a0728038539b82ca5cf8f8c460a6c6e DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23 +DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a EBUILD mobile-broadband-provider-info-20170310.ebuild 462 BLAKE2B fe682e0d76f4fd4a394388b40036b5a9923d0a4fc664218424f50ea0a619e1464789d1f013a87bc63d97528b9f21e803af771af7217c714e88f5e4c2e142226b SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4 -EBUILD mobile-broadband-provider-info-20190116.ebuild 464 BLAKE2B f0024990e4b24b6e3b3c72219e24181c107280c80bf3ba256c936dbec6ccd7a6cc94b4f5190f8c9435a580841a18f58fba6535140546410cc04601bd04aa0c62 SHA512 5019a223f8e15a7293d3409dcd30b9e5640a9bd6f35b3b5b84c4874e0aa21b2f7f00327d5b3f1d0e24980f5f1f09b74b08aa0121f289c0f9a2ec9cfc420a6f5f +EBUILD mobile-broadband-provider-info-20190116.ebuild 462 BLAKE2B 82b8b7ff1721d05527e4350b08823591b301c51eb296788c8c5d84b8c0574bf942b254b7eb6bff969b13801f17d59d808d15f06da540ceed0766029a24de92f0 SHA512 1028bf93526bbed477835c33d42185ce5e6d7737a14422d1df75b98b2b483b513f2743097f387d93e2183740f209592e069e09fd1984deed857eb7a84b761340 +EBUILD mobile-broadband-provider-info-20190618.ebuild 451 BLAKE2B c8f4bfd36aa1e660190dea24bbb42c5280c15f625f79863f0b03e29df6b8f8afa65d3aac08f1c6be1a0e9326d9a3425512d9e319ffdeefaa2a826d8bcef84649 SHA512 2c61b42043cc65a04e98453338ea16b38acebab94fed8ffbcc91abdbabf067948dc8e4d3bcd21288f21c5ff4d6adc29906b7ba92c8261885923a89051d13621a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild index 90317e80ab72..595cc35b8ca4 100644 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" LICENSE="CC-PD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="test" DEPEND=" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index b4956a659fa6..2733f12db3ce 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -21,10 +21,11 @@ AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979 AUX openssh-7.9_p1-openssl-1.0.2-compat.patch 514 BLAKE2B e3859c2bed0e4116e558e7ea8c4679a8666316c26a650acd93ea023444bf69fafad6eba47a6faef7c017d812da76fe93a291e51c427ddecc1fe89bd362758403 SHA512 dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6 AUX openssh-8.0_p1-GSSAPI-dns.patch 11634 BLAKE2B 80c304f2a8df328b77a4531bc499bbc83c378007bfd01412a3c879d8a45aa26a68d3fb2b9469f037ec37e5d54fa22aa87c5f963329fb67a16690dcb30407eec9 SHA512 075e0734a15f593a641e3fbc49c7502dc75722501ce6762f0df7a5b5fafb3cceaff05ad9e0bdcb3636b4bb20cf6e680cc20e8d242b6de9b7cec972ba12118ecd AUX openssh-8.0_p1-X509-12.0-tests.patch 531 BLAKE2B cfb14747ed4e39d11d7727b779753ddf5f7e94be56d1dbe0a76131d8434dd4453c253467ec1eb7cac49a50f5a3f81c82b804926f46dc79ed09c252397ac9d349 SHA512 7f1322a94aa79c822a8bede36a92fe48dc6b9bf7ceca3068450877b543a1d186031060d642c7d689c02e06ef3e038eae9739deda53c6401439ed20808e82ff10 -AUX openssh-8.0_p1-X509-dont-make-piddir-12.0.1.patch 818 BLAKE2B b69d9d02bcc567a7f09285d27400f1ee2c4aaf0d2024fe34d5eb54e3cdaf92f155ff9e28d0a4541060355bc334492fd5768cedcd6cbc7f21fd1a1593753da5e3 SHA512 c8e8a75cd4ce759f85fdf645a704accdd4d922fce04db7d5b5cb12ce7e648f9eb48d8ab5d897b613e7c532ab2dfbe2850fe1fe506974fbc829f57018aa20378d +AUX openssh-8.0_p1-X509-12.1-tests.patch 405 BLAKE2B 1a1c29fea98c4ce277c943709576b5130a573e9786a33c957229d74d0e572ca6e5d0dce68b5b515b5c3f44862f1f4dafe2dad1cd3d3710ca415137f8a4013b86 SHA512 0e80b79d3aa8b7e89cf250b31e6bbc2471990b9a2c0ab8b54e6af4c3de77adff3dc6db83f4f14524f830455b5ce4d586f630d33b4ac4b134d1028e325ab351b3 AUX openssh-8.0_p1-X509-dont-make-piddir-12.0.patch 814 BLAKE2B 596967e4b13d59b1fedff8fbdde7b824bf495c10d4386510b04d38cc518ea18b4dba90ec0b26692634858b39ae964865791f829a52350a9f122e7104ca4a32c1 SHA512 68b8e9235626594eb022f4bb67f11fbcc2a0236377dc26900be17d22b9aa33f1e72bf8aed868ef9f98f8a45d1a2e626411ae08dfb12575015368350a2511fda9 -AUX openssh-8.0_p1-X509-glue-12.0.1.patch 837 BLAKE2B f06530b1646d9681c3ed7f43d97d773aaf31619153665b8a13298aa438accd68c52f142e681a6107bf7e27bdf18e82d1af34cbc3321e66f2c8c2385474beb6e3 SHA512 0ff8a7c86d54e53ade7d5e6782c69185ccd7c0fe1d376896b809686badf0200e0701163d8e542da6e7d14f539f53b06356187e6ecf4ea582e3bd7fff1a01503c +AUX openssh-8.0_p1-X509-dont-make-piddir-12.1.patch 812 BLAKE2B a7ded816857183e6a35dd4706ff5c4f4788e2eee5afb08dd59aedd13f0a7d3efc04f74df43bb23d808c8ba53866fdbc1cc89a15ec1b28a995a29181430bffbcf SHA512 1fdc152be81c7a19d8d15c8da03c3de0456cdccb715d1c1fdeea6b7ef89b838e560886dc20d85696fd1105d00512aff884c20ed4117a5afae5c0c00e74831aa5 AUX openssh-8.0_p1-X509-glue-12.0.patch 825 BLAKE2B 9fc0b5b291551d55770bddcf23d44601d15cbc23a6d8f0795cd064f53e1bc2e49056b23b2d7db0aa25e31e8b68c71ef476cb926a7efa765edf81440489711225 SHA512 edd8c0bdc3b90f7afce8eb5d91ec1344b6e22fc9d16787f63eaee9a576178f5e0b4937fb0dc2640779c049a9102ece63360fef4f690b09894ec46995e0f5ebe2 +AUX openssh-8.0_p1-X509-glue-12.1.patch 825 BLAKE2B 494e16224e9dc9b90c61f7d3721305192344fe41631c6088768b578f8c5620d8e664403105073ef702df4cf234f00279e5e02fb637b2d392ea9b1a1b962b9b67 SHA512 966553aaf2188395f7d3ac05e91a604fe8db47f781b2c1e01ce7cd5a42bff0e3c76c1fbcf557ee3fbcf16ab77de61b8f9812499553f05c843e1048cd713593e4 AUX openssh-8.0_p1-hpn-X509-glue.patch 3814 BLAKE2B 9a0071d13bb602f9b0660dd74d0ae59611a0d8b8c13fab7def2ea840d1ea42bb4c0999ef44e86db2e8246c6e803797a70f9b18016da491598991052854659c03 SHA512 a986c012aa58a4764d3c4c4a5bf5d1e69edb156adf18d7e9ccae0508879da8b3e92a884d6dcfa80ec5b02d41e7784d8eb500128925ae5cee0ca948cf6bf50ba2 AUX openssh-8.0_p1-hpn-glue.patch 7029 BLAKE2B cf6fb2c59b768aecf846f0d037ae6d48f750e742f93cdd00a62caf04dfafd993e05921f5d227014e9437d3cdfff4e1b9baa832997904bf398ba06e8f874f7ceb SHA512 63eb0b12763ab53946a9f6b9db44c428d9da8b781a6e1d3f5c4b0edfca85d986cf932461205cee84f9a9db7725c9e05eb1d366b357c787a95c561bdc6514d3d7 AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed @@ -53,14 +54,14 @@ DIST openssh-7.9p1-sctp-1.2.patch.xz 7360 BLAKE2B 60e209371ecac24d0b60e48459d4d4 DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7 DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08 -DIST openssh-8.0p1+x509-12.0.1.diff.gz 629849 BLAKE2B 9366244434c525ddf8f19a476b8b49d13f8c54374986bda8585db1288e7b61c60e26e2a315bec71b52f5e0f5bf4131f0f325039909b91874baab401272418fab SHA512 c6ea243f49674bba64ee372e0532eb9fe6f109d0d5e70f10995d97b5ad5e340275b1b84c3c3bfc7eda1865619dea1370e06e34bbcc3d76af6aa7a00feccaea06 DIST openssh-8.0p1+x509-12.0.diff.gz 623765 BLAKE2B b1c0d533a58c55b0f8451ce5aa8ee9b462afdc1eee44018f30962d3427c73b12a57c2c88bc8656c09c2b39a2ac72755539eeb29e7060ced5d3e8470647f88c0a SHA512 5f678fd303e39df7a2fb23af682c5a02b33f7fdcafe6171b9db2067098a2048677c415c3bee75225eb9fbaf308cfac7f37b0865951cdb6dda0577908499a8295 +DIST openssh-8.0p1+x509-12.1.diff.gz 680389 BLAKE2B b1e353c496dd6dbd104c32bc5e9a3f055673a7876944d39c80f185cdb589d09b8d509754f04f2e051ceef2b39a3d810ba00b8894a4b67c7a6a0170a4ed0518a5 SHA512 831988d636a19e89a881616e07e38bc6ca44e90443b2bbf290fab3f120877e2eef60f21ad6e0c64098d07e09379f9f73f0ce2e5df975aa1bd43944582f8b8b3e DIST openssh-8.0p1-sctp-1.2.patch.xz 7348 BLAKE2B bc3d3815f1ef5dbab605b93182a00c2fec258f49d56684defb6564d2b60886429c615a7ab076cc071a590f9df0908b1862ceb0961b7e6f6d1090237fec9035d3 SHA512 2f9f774286db75d0240e6fb01655a8a193fb2a5dc4596ad68ed22d64f97c9c46dad61a06478f2e972fd37cbad4d9aca5829bb91097cc56638601ff94a972b24f DIST openssh-8.0p1.tar.gz 1597697 BLAKE2B 5ba79872eabb3b3964d95a8cdd690bfe0323f018d7f944d4e1acb52576c9f6d7a1ddac15e88dc42eac6ecbfabfad1c228e303a2262588769e307c38107a4cd54 SHA512 e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2 EBUILD openssh-7.9_p1-r4.ebuild 16314 BLAKE2B 4b78ac7c56c7aa5ab0225b07cc8d4f4739408221372064d17bd095dd440af3a9541713ab55de5bdb2347a373b9e267c0e3f38bb992f4ea3da893ff8a808970e0 SHA512 2f9ab98645c6d2ab67ee2e715719cdb868d02e8df19de85bc2556dfa62c26f946125a9fcdbbbdd34a596961272655947d6c6657dc1b477b646d4e42e8ad931af -EBUILD openssh-8.0_p1-r1.ebuild 16177 BLAKE2B 95faa95addb0e0f291de5651772faed42e2d97d8151b21ed111cb5a9163294909e7d2cde9cb46ce9a3fa770a9222ca06124352cefb9e19eb6a7615e0a2c2cf8c SHA512 9cabd6d0e31e2c981424f1bb4829eb784add65b6f6697624035e4d9f3a9b8c8f7a333d257ebc5cebfb9e8f1ee9d76d0374036ce5dd41802ef0cc6d1756102e23 +EBUILD openssh-8.0_p1-r2.ebuild 16187 BLAKE2B 5890324e2cabf83c0371bb1cea9903e1ef6db950351d3a56c0bee1747f498dc950babf514eb50169e43e1bb18c6a8164c3f8654e6034e9cca39ce3cc74ebbddc SHA512 15844c5db3136bea3d8a49a574e00d83e2cc6ee8864d291449752d41e3f4a4ff477b708aa070d87b08bd4dce6b6aa4daceac542eb03fcd3e44935bec02712572 EBUILD openssh-8.0_p1.ebuild 16146 BLAKE2B 613b780cdde9d39e9f1f67267c773dded920c511c6e8d1241c92c72d9957b39e870517c868d17c72db2ae68bfc2b2d64ba85b777331082d4011057ca87cdb59e SHA512 9358116310155833391140a586d4c375292a9eb68fe40bf7453e9ee547c74bbcb750e360fd43c7c585a222cb053804a413023c0dcc06ab824df964826476853e MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.1.patch deleted file mode 100644 index e4aca305e005..000000000000 --- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.1.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/openssh-8.0p1+x509-12.0.1.diff 2019-04-29 14:11:55.210175168 -0700 -+++ b/openssh-8.0p1+x509-12.0.1.diff 2019-04-29 14:12:55.603761971 -0700 -@@ -34176,12 +34176,11 @@ - - install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf --@@ -334,6 +352,8 @@ -+@@ -334,6 +352,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.1.patch deleted file mode 100644 index 244aef4c3992..000000000000 --- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.1.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/openssh-8.0p1+x509-12.0.1.diff 2019-04-29 14:07:39.687923384 -0700 -+++ b/openssh-8.0p1+x509-12.0.1.diff 2019-04-29 14:08:11.330706892 -0700 -@@ -76610,16 +76610,6 @@ - + return mbtowc(NULL, s, n); - +} - +#endif --diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0.1/version.h ----- openssh-8.0p1/version.h 2019-04-18 01:52:57.000000000 +0300 --+++ openssh-8.0p1+x509-12.0.1/version.h 2019-04-29 19:07:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.0" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0.1/version.m4 - --- openssh-8.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.0p1+x509-12.0.1/version.m4 2019-04-29 19:07:00.000000000 +0300 diff --git a/net-misc/openssh/openssh-8.0_p1-r1.ebuild b/net-misc/openssh/openssh-8.0_p1-r1.ebuild deleted file mode 100644 index c541630005b9..000000000000 --- a/net-misc/openssh/openssh-8.0_p1-r1.ebuild +++ /dev/null @@ -1,461 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user eapi7-ver flag-o-matic multilib autotools pam systemd - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -#HPN_PV="${PV^^}" -HPN_PV="7.8_P1" - -HPN_VER="14.16" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.0.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -PATCH_SET="openssh-7.9p1-patches-1.0" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} - " - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509" -RESTRICT="!test? ( test )" -REQUIRED_USE="ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl ) - test? ( ssl )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - <dev-libs/openssl-1.1.0:0[bindist=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - >=sys-libs/zlib-1.2.3:=[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( virtual/pam ) - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig - virtual/os-headers - sys-devel/autoconf" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth )" - -S="${WORKDIR}/${PARCH}" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch" - popd || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" - pushd "${hpn_patchdir}" - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch - if use X509; then - einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # X509 and AES-CTR-MT don't get along, let's just drop it - rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch - popd - - eapply "${hpn_patchdir}" - - if ! use X509; then - eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch" - eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" - fi - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED%/}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED%/}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if has_version "<${CATEGORY}/${PN}-7.7_p1" ; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest index d7b84fb2e3ff..2b84985785b2 100644 --- a/net-misc/s6-networking/Manifest +++ b/net-misc/s6-networking/Manifest @@ -1,5 +1,7 @@ DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256 DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762 +DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9 +EBUILD s6-networking-2.3.0.4.ebuild 1472 BLAKE2B 295b4795452b0f531e4a499346380f61addf9af31597471872ced7930ddde99c94f07accc1456b467333e9acb383493a0c76152b38f28486ad5156113679853d SHA512 88fb58f470a98c77d898dc7fb3d5c1817c319f7c75136aac0428135694186ceef766d2e1fd9371535d6143566f2780a1532159fbdfcb1dbc2e847ad54c20d2e0 MISC metadata.xml 970 BLAKE2B f9792b261130ed67ef4d8c39e2d2527af114ffa21c0fbb1213b9fda6f76235254b77521ecafb551345694e2a3334837a6f03f208048b6b109b06decdb8d9dd57 SHA512 29c7d44849f2e08812af16e5da7ac72858d9deff240d8ee71dae789b498e1f7385f3b94f39d87672ffb625eff4b4645f441858bf9463c269510439bb7c3987bc diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index bc3b70ba2bbe..c312e243b9c1 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,6 +1,8 @@ AUX smb4k-3.0.0-fix-mount-readwrite-shares.patch 4702 BLAKE2B 762b5023d8249b5c35f53ac34d6b779b8464384d08957c3c8ee1f3bfb9ab78d052f0570e47a2338296ef4a70c02ebe93fd7822b480c51325639f7eb4bbae52e7 SHA512 1c6ec72764ea682b6a3e97c857eb86e497f02cb2e525cd92baab3249cb967d836f6aa52a00c41bec2da6349eb7855b8f1911cec8a98ed6cb1e4356fa33720bfb DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7 DIST smb4k-3.0.0.tar.xz 3825920 BLAKE2B 5439caa8f02fc93cd2065384e2b502abdca328fd186cb10ac0837d7eb289a2d62bedd81439a6d5b0e815edfb7fe168fcb70f0e645f3bae2d39a391d0688487f6 SHA512 b32a7151adb46b93e2c245136752435d3842e135baeb2b44343287d2eaf9f2aa5622a28b19df7d821390a35994f3ce204fdf20aeeac6ad67e9eb3b144ee22e33 +DIST smb4k-3.0.1.tar.xz 3826160 BLAKE2B e42d761d67ae6b25e75fc673eb18838607dc36d5c76d4cba63257d09c2e138fcc3b1e3600163188117a020327645b7fe320d4a25f7455f2585cdbcf567e3d941 SHA512 de61d7dc2f63657056d721ac5ef5c12e8c8393b674163c2888a63a58f5779b0efcc47c2acaee782979c4bd9abc008eb457b6fce31d085b3e80c0970a195528b9 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db EBUILD smb4k-3.0.0-r1.ebuild 1709 BLAKE2B d29e564e1db91c9ffe2b0c0fc2dd19661e5c7ee697be1b7bf1ffc5ef9790ebb6ba44ef8a02c57a0e746cc7b802d2402bda054896676958b50550227e8e5c06dc SHA512 b0bb163c2f74ae280813c82031ce1fb3766bb74c582ad4e5c55699b8fd68003339e6d64b049ac47c5acebea5d67e2b68cb3ba0bf6ba2fb38ddbc1dfc3e581ff8 +EBUILD smb4k-3.0.1.ebuild 1643 BLAKE2B c977bbcb606b4509d691854a575462f110f1e25874c95de5d1cab1e0cb04e36f29022eafd8b3f0d5f3ddafc915a2d73349bd3929374b731e10397157fa2c389d SHA512 9c065df4523b52a4a3f7bcc99c5e0e9071894adf5ffd0942ed1f55eab1bdfcb0a59a215402da0b440e6bab7210358497496458f62cdcd4b4d3f04e135f160a17 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711 diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 835067a7824f..2f9808f1b85f 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -10,8 +10,10 @@ DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9 +DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96 EBUILD stunnel-5.50-r1.ebuild 2890 BLAKE2B ffa69c7b02614e5e43164dade91920f81f2cba817c0e8c057bc9a795c667f3f6f045697ff00499359b444c3f9e226c0ee044debee52cc2e9dea6c0bb233c637b SHA512 bd837960737a05e94d0905663ccc58d7216a054222af31b6ebc907e7855e5d6e2c995f0fb256b89df08dd77d7b8af0f0f362350f8e3f2f02ea91c6feb00853c4 EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419 EBUILD stunnel-5.54.ebuild 2907 BLAKE2B f2f85b3b178486d0c6720cbab05be44feeaaf238e476bc43b216bf181435b3b092ce55b4fa2ef40592f06b8f84c0f7d705335c782df9fbc7dc9c6daf4d328d32 SHA512 ae6df10bc5c499b3a8e4835334358df143fb5da32b8c578ed7dbeace2b8d297e27315b0d1639b4eabdabe91a145c9a11d1b9a0e9ba761abfeeea411e3b045f04 +EBUILD stunnel-5.55.ebuild 2781 BLAKE2B b7c701090cfc2f84e212e1764d79a561dec909b140e2fb83b524bd26567143331c075b6e67fcc21afa5a816d5e38dae4de2f37591fbe86f6f09b566d6895791b SHA512 6a3b18c18f85d5e2a50aebd5cc112058ceefa739caf0c7c7ad41b3621dbdca11145892acce0d7ee1f2bb8f284bf05c10db5b79f7c4913d312d80ccb79a6da9c0 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362 diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 77417613325c..d79b4575d4f8 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,6 @@ -DIST youtube-dl-2019.05.20.tar.gz 3167834 BLAKE2B fe5501380b5134665b3c5c31a7b703832d7c7d9675c1e7c20bfa2b4ebc175e37521b423b68d3701a3637e047e3d4f12e54786f7d6f23e896f0a9da93c39be6f5 SHA512 c50661585f987a6c2abc7b9940749a2ba8e9a534d66f0846dddb265be3fe5a58ba8009fbad44c2551c7574b73bc21aa35f7d633729c0090c46e5818199dccb1d DIST youtube-dl-2019.06.08.tar.gz 3169571 BLAKE2B 4603e19e80921b12526575bd13a0b43ff98d871e7a40415dd5b09bb2a0b720ffd60f4d54eecbf44b7144146a6f64d9692a1aaa42c06e4944f5a5a00667c411c3 SHA512 6758d629ff0b56ed6589d024f29761cbe4678154316a370090d6eca62611791b79b8662a70c54e333362db0495131935d47bcbfcb40ae6dcf1cc0c8808790799 -EBUILD youtube-dl-2019.05.20.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c -EBUILD youtube-dl-2019.06.08.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5 +DIST youtube-dl-2019.06.21.tar.gz 3169975 BLAKE2B c8867638147e45f5f1137b89b0259301b717a2249ac96143f70dc3b0b6850f887cf402e8e5e22249afaef40409a2f1c4137051553f5750633f3dc79d42967b59 SHA512 b116f1b636b616e7bd2f5f3d8bbec3b9acebc956f2864391392cfa8bd2af91faa97603d528a13abb6e69ac861582d296870579469e4c6f4f4816dc674e0c27bb +EBUILD youtube-dl-2019.06.08.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c +EBUILD youtube-dl-2019.06.21.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild b/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild deleted file mode 100644 index 4d80cb2b49ed..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7}) -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://rg3.github.com/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -LICENSE="public-domain" - -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -RESTRICT="test" -SLOT="0" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] -" -RDEPEND=" - ${DEPEND} - || ( - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - ) -" -S="${WORKDIR}/${PN}" - -src_compile() { - distutils-r1_src_compile -} - -python_install_all() { - dodoc README.txt - doman ${PN}.1 - - newbashcomp ${PN}.bash-completion ${PN} - - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} - - insinto /usr/share/fish/vendor_completions.d - doins ${PN}.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "${PN}(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want ${PN} to embed thumbnails from the metadata into the" - elog "resulting MP4 files, consider installing media-video/atomicparsley" -} diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild b/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild index a8b1afbfc11a..4d80cb2b49ed 100644 --- a/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/" SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" RESTRICT="test" SLOT="0" DEPEND=" |