diff options
Diffstat (limited to 'net-misc')
48 files changed, 1155 insertions, 1071 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex b290384793c8..c98009f6a457 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 32e319b89c4d..1913f955de02 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -8,8 +8,10 @@ AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427 DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0 DIST chrony-3.4.tar.gz 453056 BLAKE2B 088eb18bfc9ae4a7a3d656dfabddc565bc4a0da995c172183bed12bc5df59e87ab7363ba64e3579cdb414da77bd7f1fe05b66e33474282df57daf1fd8a55e182 SHA512 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 +DIST chrony-3.5-pre1.tar.gz 457961 BLAKE2B a43e36df7d3b2a2865efb784240e399c2a16748064cedf96b0da849f0cdf8b4d91e7fc616995277f29d2c55176e08526dbedbc8b866238994f8a4187b822aa20 SHA512 ccca35e17f18ed80e0db984c321f5fefabb1056feaae3aed08bf9e1ae732b22af05f87bafe812154af7e5adced91d90618e3833bc266be06ba2fa095685b07da EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf EBUILD chrony-3.4.ebuild 2913 BLAKE2B 407081e189b5664f6899671ae75d28e544aa5bff61e4a510083f45155d06a82ca6c1589284bf73018fdfd79d0cd411456231519eb802de68a1b2bc1e42893ca3 SHA512 7502287f4b9a2e5f9d006dfdf744756b66abd4f920a4214ac2ab4183b7bab3b4427babf16eda204857b839f79cd7d7aa6ed223e8c7de2c21975e9629d722c757 -EBUILD chrony-9999.ebuild 2800 BLAKE2B 39990629d85aab317f84e1e083e3b94b28c27834116108d509c213f297ca4e2d1b1d87b7d7ccf75206004b5813c1f6d3b50b33b4fa9bd50f04f485865465f7c8 SHA512 b8120434e2646b91727b63560f5002ea7c97696f780eeb02a91c97ee1de053a093eb3009b8721c139ab20ff15dce857e7d4af00fd51ac9aa3624b5282dadd386 +EBUILD chrony-3.5_pre1.ebuild 2903 BLAKE2B 234b15b07d24111a2d8d19b440f97451a0e1605bc5c94389c8a739e379616891208725cfa962f9faddac6a240d5dda7e0f2011f9d70a2769b0fb848784c3bde2 SHA512 62e285a43b81f524079957d4d5fc291478c8d0ee318ff27914e7c2fe4ada76a9f6f4585804f93d958040af882fe49eaf1913558c5c463ba21822806e685913d3 +EBUILD chrony-9999.ebuild 2790 BLAKE2B e411f8d925057bf43ad237702f31ad58f2408cf56280b1af7de0c3415cb4ceec453eac1ae487a24f59273bb3e826c2cf47676db95ad401881bcf8eaf70832c3b SHA512 79e79db3175a411106cc9d909a83795d5cd41a6ffdc784904e4984287e67213b858cee653660ff20620030128e987a963c92b5c4f05ee43bcf08ac9ff61dd50e MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84 diff --git a/net-misc/chrony/chrony-3.5_pre1.ebuild b/net-misc/chrony/chrony-3.5_pre1.ebuild new file mode 100644 index 000000000000..d32f046f9da9 --- /dev/null +++ b/net-misc/chrony/chrony-3.5_pre1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/" +SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns" +REQUIRED_USE=" + ?? ( libedit readline ) +" + +CDEPEND=" + caps? ( sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + readline? ( >=sys-libs/readline-4.1-r4:= ) + seccomp? ( sys-libs/libseccomp ) +" +DEPEND=" + ${CDEPEND} + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/chronyd-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local CHRONY_CONFIGURE=" + ./configure \ + $(use_enable seccomp scfilter) \ + $(usex adns '' --disable-asyncdns) \ + $(usex caps '' --disable-linuxcaps) \ + $(usex cmdmon '' --disable-cmdmon) \ + $(usex ipv6 '' --disable-ipv6) \ + $(usex ntp '' --disable-ntp) \ + $(usex phc '' --disable-phc) \ + $(usex pps '' --disable-pps) \ + $(usex refclock '' --disable-refclock) \ + $(usex rtc '' --disable-rtc) \ + ${CHRONY_EDITLINE} \ + ${EXTRA_ECONF} \ + --chronysockdir=/run/chrony \ + --disable-sechash \ + --docdir=/usr/share/doc/${PF} \ + --mandir=/usr/share/man \ + --prefix=/usr \ + --sysconfdir=/etc/chrony \ + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + --without-nss \ + --without-tomcrypt + " + + # print the ./configure call to aid in future debugging + einfo ${CHRONY_CONFIGURE} + bash ${CHRONY_CONFIGURE} || die +} + +src_compile() { + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${FILESDIR}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + if use html; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit examples/chronyd.service +} diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 3281755d0869..188564043dd7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils git-r3 systemd toolchain-funcs +EAPI=7 +inherit git-r3 systemd toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/" diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index f092272a7910..549c97b16186 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -4,8 +4,7 @@ AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4 DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3 -EBUILD dhcpcd-7.1.1-r1.ebuild 4546 BLAKE2B 25c5c3e6d7e711b616bb5a9027d92a9606c5e91ccc42fe7494cefe8abc30bdca7387171f3c09a44cfb863a304e9bf64f9afb203d7194b59ef32f6aca5a0a8543 SHA512 2ec21f7e6dfc864d11c90ef2ef99509311823eeae91008a3f10c34fa193c4d06cd7fe370403a1eb0eeb06bd75fdc1966abb54e2ee759b0648af683db5bdc16db -EBUILD dhcpcd-7.1.1-r2.ebuild 4596 BLAKE2B b111c89b4d71b3142aeb86b58798f14107c1587190a74e904bef20f45a3eb79ee79561a1cbc60b13beaf0d62da97787db0c282b924e2b48c2ba1c3202ee8c393 SHA512 fbcea64846212f3c79557a6a4d4b5db513295a18065742aafd6b11c18b33e7df9a0934c4158485cbf46fd8da88bff7d5aea44abc274be11587a3e3efe5554532 +EBUILD dhcpcd-7.1.1-r2.ebuild 4589 BLAKE2B 7b2a6de223666229f41fe9062a0c5234f0cfb300405cd5fa5d7fe6eb8d788d11edacfc803e42ad27a09fadd8593f59b8ea5ac27cf5e8f6b3f87d243efc08fe8d SHA512 2f761b8d0534c1555cfc716c38117ad1d5d4b871c71a085cd703da3ef3cadad755b07409f69926f08400f60cd008a41668d762c5a550bf31bb27643eb14996de EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild deleted file mode 100644 index 9c02a7a0ea5a..000000000000 --- a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd toolchain-funcs - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://roy.marples.name/projects/dhcpcd" -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev" - -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-disable_inet6_fix.patch #677508 -) - -src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" - local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - ${rundir} - $(use_enable embedded) - $(use_enable ipv6) - ${dev} - CC="$(tc-getCC)" - ${hooks[@]} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild index 2421095333a1..88f47e8867ba 100644 --- a/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild +++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild @@ -13,7 +13,7 @@ else MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest index f9f159c14552..9197f18a438e 100644 --- a/net-misc/endlessh/Manifest +++ b/net-misc/endlessh/Manifest @@ -1,7 +1,12 @@ 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-9999.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 diff --git a/net-misc/endlessh/endlessh-1.0.ebuild b/net-misc/endlessh/endlessh-1.0.ebuild new file mode 100644 index 000000000000..e0a840877f36 --- /dev/null +++ b/net-misc/endlessh/endlessh-1.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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="" + +DEPEND="" +RDEPEND="" +BDEPEND="" + +src_prepare() { + default + + tc-export CC + + sed -i \ + -e 's/^CC/CC?/' \ + -e 's/^CFLAGS =/CFLAGS +=/' \ + -e 's/ -Os//' \ + -e 's/^LDFLAGS/LDFLAGS?/' \ + -e 's/^PREFIX/PREFIX?/' \ + Makefile || die + + sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ + util/endlessh.service || die +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + + einstalldocs + + newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh + newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh + + systemd_dounit util/endlessh.service + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotated-r1" endlessh + + insinto /usr/share/"${PN}" + doins util/{pivot.py,schema.sql} +} + +pkg_postinst() { + elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}" + elog "Install dev-python/pyrfc3339 if you are going to use it" +} diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild index 105c786b1013..e0a840877f36 100644 --- a/net-misc/endlessh/endlessh-9999.ebuild +++ b/net-misc/endlessh/endlessh-9999.ebuild @@ -3,9 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit python-single-r1 systemd toolchain-funcs +inherit systemd toolchain-funcs DESCRIPTION="SSH tarpit that slowly sends and endless banner" HOMEPAGE="https://github.com/skeeto/endlessh" @@ -20,25 +18,12 @@ fi LICENSE="Unlicense" SLOT="0" -IUSE="tools" -REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" +IUSE="" DEPEND="" - -RDEPEND="${DEPEND} - tools? ( - ${PYTHON_DEPS} - dev-db/sqlite - dev-python/pyrfc3339[${PYTHON_USEDEP}] - ) -" - +RDEPEND="" BDEPEND="" -pkg_setup() { - use tools && python-single-r1_pkg_setup -} - src_prepare() { default @@ -49,6 +34,7 @@ src_prepare() { -e 's/^CFLAGS =/CFLAGS +=/' \ -e 's/ -Os//' \ -e 's/^LDFLAGS/LDFLAGS?/' \ + -e 's/^PREFIX/PREFIX?/' \ Makefile || die sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ @@ -56,15 +42,23 @@ src_prepare() { } src_install() { - dobin endlessh + emake DESTDIR="${D}" PREFIX=/usr install - newinitd "${FILESDIR}"/endlessh.initd endlessh - newconfd "${FILESDIR}"/endlessh.confd endlessh + einstalldocs + + newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh + newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh systemd_dounit util/endlessh.service insinto /etc/logrotate.d - newins "${FILESDIR}/logrotated" endlessh + newins "${FILESDIR}/logrotated-r1" endlessh - einstalldocs + insinto /usr/share/"${PN}" + doins util/{pivot.py,schema.sql} +} + +pkg_postinst() { + elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}" + elog "Install dev-python/pyrfc3339 if you are going to use it" } diff --git a/net-misc/endlessh/files/endlessh.confd-r1 b/net-misc/endlessh/files/endlessh.confd-r1 new file mode 100644 index 000000000000..13ba0ef55d2e --- /dev/null +++ b/net-misc/endlessh/files/endlessh.confd-r1 @@ -0,0 +1,34 @@ +# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh +# +#ENDLESSH_ARGS="" +# Usage: [-vh] [-46] [-d MS] [-f CONFIG] [-l LEN] [-m LIMIT] [-p PORT] +# -4 Bind to IPv4 only +# -6 Bind to IPv6 only +# -d INT Message millisecond delay [10000] +# -f Set and load config file [/etc/endlessh/config] +# -h Print this help message and exit +# -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) +# -V Print version information and exit + +# EXAMPLE 1: listen on port 22, log all queries and errors in very verbose mode +#ENDLESSH_ARGS="-p 22 -vv" + +# EXAMPLE 2: load settings from config file +#ENDLESSH_ARGS="-f /etc/endlessh/config" + +# EXAMPLE 3: load settings from config file, but override port +#ENDLESSH_ARGS="-f /etc/endlessh/config -p 22" + + +# LOGGING: is disabled by default, enable this to actually redirect messages + +# 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-r1 b/net-misc/endlessh/files/endlessh.initd-r1 new file mode 100755 index 000000000000..ea8d830af439 --- /dev/null +++ b/net-misc/endlessh/files/endlessh.initd-r1 @@ -0,0 +1,29 @@ +#!/sbin/openrc-run +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + after bootmisc + need localmount + use clock logger net +} + +description="Starts endlessh tarpit" + +command="/usr/bin/endlessh" +command_args="${ENDLESSH_ARGS}" +command_background="true" +extra_started_commands="dumpstats reload" +pidfile="/run/${RC_SVCNAME}.pid" + +dumpstats() { + ebegin "Dumping connection stats of ${RC_SVCNAME} to log" + start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}" + eend $? +} + +reload() { + ebegin "Reloading ${RC_SVCNAME} configuration" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/net-misc/endlessh/files/logrotated-r1 b/net-misc/endlessh/files/logrotated-r1 new file mode 100644 index 000000000000..896e89e6474f --- /dev/null +++ b/net-misc/endlessh/files/logrotated-r1 @@ -0,0 +1,9 @@ +/var/log/endlessh.log /var/log/endlessh.error.log { + copytruncate + missingok + notifempty + sharedscripts + prerotate + /etc/init.d/endlessh --ifstarted --quiet dumpstats + endscript +} diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index edfabdcc583e..17867188fe37 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -1,18 +1,18 @@ AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f +AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19 AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559ee1111a2f8b4c479edd4af454652989843c8444dffcbb72206dd530cfe7204a80bba3123219f81b95acd8f1f5 SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 -DIST iperf-2.0.12.tar.gz 324528 BLAKE2B db5b0a3566912f98f2647ff43ed440704caf6b67aeb3b4c698262aa94868f0fc2b2fd304beb885a0db7062ee274c5435a2a3593f88c6386044d0c4c3d47f9bfd SHA512 fd672e545b6e0a74e5061e4c861378c69490a978b63ee63414842bf379a202484868010deb27cb9f2a3691d74fe3b1e6a61dff37abeabd9e3db4c3317908e461 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea DIST iperf-2.0.9.tar.gz 277702 BLAKE2B 6de23e43be0c14bce2379e699b1e25a8ac5ed80cdef1493167c80253cbefac3357dadb00c15d572c5e4213528d0e48b9242cd93b71dc367e22753243e56b2496 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2 DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 DIST iperf-3.5.tar.gz 596476 BLAKE2B 756216618b45b637581318afaa5b48366061501c3ee65bbd6788ed1b6ab61073fa5e231a5212cde0a0703970c97af2511aaa59e250f2326cc1e393771828850c SHA512 f1823b5cd23b344b772a37f485e458d6b3703c11892ea4fa2abca61f474eed6229b3cb75db78adedf87092431d11c3174bfbd92833fc56dedab64953f50ac6a4 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d -EBUILD iperf-2.0.12.ebuild 752 BLAKE2B 72acd92d2cb33a31953cd024efe80b65527ec1808308b1b90e012aa72b77585e6f73cadefbe4870b24284b6f9a2871b832c75aefdc8185169a36d199fe90c63b SHA512 7ed8c871573d7024e0d1fc168455c12f811349280964400b61c68a587927a5438d33f0bad7ba1cab60e55e5c7f625e0fd50b3614411c232c861d169ccb425f32 EBUILD iperf-2.0.13.ebuild 749 BLAKE2B 058fee353d0b527ff7b498393edede4b27a6e964986a9ea0a5c1726438f5a5ea5e3b78b8c3ebe0c11f6c4eb183479a5ff9ccbc36391cffabfe3835c9630fc85d SHA512 063744c9a43f5cc37bc56adf9fe0980adb448a119afd41b006e8192bb91de562a7b5942259aefcdb5c76c07515e8fbee552fed6184dc191933febe7712e4458e +EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 8fed944e9f1e47b14d0ea2f462fd8003393f4c0b47640d6937293130599a6d33a38ba86069e20ef5fc09cdf2429130153eaab7a88e69ff44ffe11cd06f618c06 SHA512 b1cc22a9d741dbce419c724af8462f199f02738c9c78b55b2305a5f3d051d0d64a8a3e369cfa1bffd6c7b251274423683508e57f1c67843eeeca331032f51399 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e -EBUILD iperf-2.99999.99999.ebuild 714 BLAKE2B 084ab539cbc2937bcdeb0aa0cf8932e630c1ff4bfd828649f528240dd75800497b770690cb059bc829c6a80ad106485ca748e70887a32f74b065cd146e5c2033 SHA512 0a55b9adacba8a42e7ab42d78e5af49fc03d5ab5409ced8ea35e8a61afe1a2c3eccf098916615157f2cef057f6e2e6f8c548bc8e6b6b495b47ca9d84be7b0f30 +EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c993bd71558c85327c292d8b302839b8c83e4814d37c30a567f2ca65570112cbdc9e2025ba48db78414c940cca1322f9 SHA512 c2f68699b11ac215a5819242435dfbe4df964f83c2b864d592b0795ec9506ada2ac7e41abefeaa152fee1138ed9ea0c13d3f200b403dff35b1b3eb70351a2122 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999 EBUILD iperf-3.5.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf EBUILD iperf-3.6.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf diff --git a/net-misc/iperf/files/iperf-2.0.14a.patch b/net-misc/iperf/files/iperf-2.0.14a.patch new file mode 100644 index 000000000000..07fbd0c96b84 --- /dev/null +++ b/net-misc/iperf/files/iperf-2.0.14a.patch @@ -0,0 +1,132 @@ +commit 12254fa398e627949af923afd0d48cd9b814f0a0 +Author: rmcmahon <bob.mcmahon@broadcom.com> +Date: Tue Jan 29 23:11:18 2019 -0800 + + new version 2.0.14a, fix for -P w/server and summing + +diff --git a/configure b/configure +index f1a9983..706e7a3 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for Iperf 2.0.13. ++# Generated by GNU Autoconf 2.69 for Iperf 2.0.14a. + # + # + # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +@@ -577,8 +577,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='Iperf' + PACKAGE_TARNAME='iperf' +-PACKAGE_VERSION='2.0.13' +-PACKAGE_STRING='Iperf 2.0.13' ++PACKAGE_VERSION='2.0.14a' ++PACKAGE_STRING='Iperf 2.0.14a' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1313,7 +1313,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures Iperf 2.0.13 to adapt to many kinds of systems. ++\`configure' configures Iperf 2.0.14a to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1383,7 +1383,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of Iperf 2.0.13:";; ++ short | recursive ) echo "Configuration of Iperf 2.0.14a:";; + esac + cat <<\_ACEOF + +@@ -1493,7 +1493,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-Iperf configure 2.0.13 ++Iperf configure 2.0.14a + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by Iperf $as_me 2.0.13, which was ++It was created by Iperf $as_me 2.0.14a, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -3101,7 +3101,7 @@ fi + + # Define the identity of the package. + PACKAGE='iperf' +- VERSION='2.0.13' ++ VERSION='2.0.14a' + + + cat >>confdefs.h <<_ACEOF +@@ -8854,7 +8854,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by Iperf $as_me 2.0.13, which was ++This file was extended by Iperf $as_me 2.0.14a, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -8920,7 +8920,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-Iperf config.status 2.0.13 ++Iperf config.status 2.0.14a + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +diff --git a/configure.ac b/configure.ac +index cd3c9a0..4c93328 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5,7 +5,7 @@ dnl =================================================================== + + + AC_PREREQ(2.59) +-AC_INIT(Iperf,2.0.13) ++AC_INIT(Iperf,2.0.14a) + AC_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE() + +diff --git a/include/version.h b/include/version.h +index 87279a7..d6f9d89 100644 +--- a/include/version.h ++++ b/include/version.h +@@ -1,4 +1,4 @@ +-#define IPERF_VERSION "2.0.13" +-#define IPERF_VERSION_DATE "21 Jan 2019" ++#define IPERF_VERSION "2.0.14a" ++#define IPERF_VERSION_DATE "29 Jan 2019" + #define IPERF_VERSION_MAJORHEX 0x00020000 +-#define IPERF_VERSION_MINORHEX 0x000D0003 ++#define IPERF_VERSION_MINORHEX 0x000E0000 +diff --git a/src/Reporter.c b/src/Reporter.c +index 80891aa..d5164ef 100644 +--- a/src/Reporter.c ++++ b/src/Reporter.c +@@ -151,7 +151,9 @@ MultiHeader* InitMulti( thread_Settings *agent, int inID) { + memset( multihdr, 0, sizeof(MultiHeader) ); + Condition_Initialize( &multihdr->barrier ); + multihdr->groupID = inID; +- multihdr->threads = agent->mThreads; ++ if (agent->mThreadMode == kMode_Client) { ++ multihdr->threads = agent->mThreads; ++ } + if ( isMultipleReport( agent ) ) { + int i; + ReporterData *data = NULL; diff --git a/net-misc/iperf/iperf-2.0.12.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild index 95f3d7dca146..b680ce3d38bb 100644 --- a/net-misc/iperf/iperf-2.0.12.ebuild +++ b/net-misc/iperf/iperf-2.0.14a.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" HOMEPAGE="http://iperf2.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz" LICENSE="HPND" SLOT="2" @@ -15,7 +15,9 @@ IUSE="ipv6 threads debug" DOCS="INSTALL README" PATCHES=( "${FILESDIR}"/${PN}-2.0.12-ipv6.patch + "${FILESDIR}"/${P}.patch ) +S=${WORKDIR}/${PN}-2.0.13 src_configure() { econf \ diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild index ee2ce2958181..99746d3f101f 100644 --- a/net-misc/iperf/iperf-2.99999.99999.ebuild +++ b/net-misc/iperf/iperf-2.99999.99999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 1d03a39eb951..cf802637c614 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -10,11 +10,13 @@ DIST memcached-1.5.10.tar.gz 465169 BLAKE2B cfdd4cba4baf3c628b6cb655bbc91fc493b7 DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6b9966875de35fcdc322631e276becbc9bd694e1c7ea04822ccabd5796422f1f505bc046a08b3b69b76bf9fef1b42 SHA512 1d641383a9d5c6a1f074a1f30493d50fb3384f29d07078dc827fcb1f9e70f6c07f12a3c6c2a128905ffddf2c414998afbbe3456d8cd4fe43e43606bf9933d822 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8 DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b +DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475 EBUILD memcached-1.5.12.ebuild 2923 BLAKE2B db692987cbde108325f1a634338339a33cc05994a3dbc9d5ee30a096b5fac6bf91779874257a217b95ae6266a29c6c821798deb20821f42be92b71c6945dfc04 SHA512 f32c20794b3385d881abdcd109c1569d725af77e4d08ce384e1ff10c55ca330f9fb200a5c9a8f1353f36d650633a8e110a1af3ddc54d7c6a446ab181caacef29 EBUILD memcached-1.5.13.ebuild 2921 BLAKE2B 2b1c3a401a1709575ed32394830c0e8c155962ed8762d5645983437aaf55eb97ecc04c29dc8bb4d85601a019034e7187ad8cfc0ffe50531c9303969e4f103d62 SHA512 d2aa1b965e03d0242265b151dd29c0fd1dab9858c650eace0a1a931a24b6ecb5e5adda22993d738eb8bf06c62a8db3ca6f2e002aa0378f5847ecd4010e756129 +EBUILD memcached-1.5.14.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild new file mode 100644 index 000000000000..8d046a22030e --- /dev/null +++ b/net-misc/memcached/memcached-1.5.14.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils flag-o-matic systemd user + +MY_PV="${PV/_rc/-rc}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="High-performance, distributed memory object caching system" +HOMEPAGE="http://memcached.org/" +SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz + https://www.memcached.org/files/old/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later + +RDEPEND=">=dev-libs/libevent-1.4:= + dev-lang/perl + sasl? ( dev-libs/cyrus-sasl ) + seccomp? ( sys-libs/libseccomp ) + selinux? ( sec-policy/selinux-memcached )" +DEPEND="${RDEPEND} + test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch" + epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" + epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch" + epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" + sed -i -e 's,-Werror,,g' configure.ac || die + sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die + eautoreconf + use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN + + # Tweak upstream systemd unit to use Gentoo variables/envfile. + # As noted by bug #587440 + sed -i -e '/^ExecStart/{ + s,{USER},{MEMCACHED_RUNAS},g; + s,{CACHESIZE},{MEMUSAGE},g; + s,OPTIONS,MISC_OPTS,g; + }; + /Environment=/{s,OPTIONS,MISC_OPTS,g;}; + /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; + ' \ + "${S}"/scripts/memcached.service + default +} + +src_configure() { + econf \ + --disable-docs \ + $(use_enable sasl) + # The xml2rfc tool to build the additional docs requires TCL :-( + # `use_enable doc docs` +} + +src_compile() { + # There is a heavy degree of per-object compile flags + # Users do NOT know better than upstream. Trying to compile the testapp and + # the -debug version with -DNDEBUG _WILL_ fail. + append-flags -UNDEBUG -pthread + emake testapp memcached-debug CFLAGS="${CFLAGS}" + filter-flags -UNDEBUG + emake +} + +src_install() { + emake DESTDIR="${D}" install + dobin scripts/memcached-tool + use debug && dobin memcached-debug + + dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} + + newconfd "${FILESDIR}/memcached.confd" memcached + newinitd "${FILESDIR}/memcached.init2" memcached + systemd_dounit "${S}/scripts/memcached.service" +} + +pkg_postinst() { + enewuser memcached -1 -1 /dev/null daemon + + elog "With this version of Memcached Gentoo now supports multiple instances." + elog "To enable this you should create a symlink in /etc/init.d/ for each instance" + elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" + elog "Please see Gentoo bug #122246 for more info" +} + +src_test() { + emake -j1 test +} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index e9d5c9a4ab42..7a1414d53e91 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,5 +1,7 @@ AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771 DIST miniupnpd-2.1.20190408.tar.gz 235989 BLAKE2B cdfb4fe23a136d9a3e0cc91c174fc4f0ee0a3e136305a2ea6d21c358287f67d34009b37ba8870bef86e53d056e441b45e19a89939e72485051245b5d40b384ff SHA512 f812660c1f626f1fdbcaabd6636125cc18f1306bb4a3a29dae45c06017c97c681e3e056d602fe5444962ecc1aec4d39d9c203621bb11a3aa1f57cda6dc4f19de +DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B 9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045 SHA512 6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1 EBUILD miniupnpd-2.1.20190408.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722 +EBUILD miniupnpd-2.1.20190502.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69 diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild new file mode 100644 index 000000000000..673b340fb090 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict" + +RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_prepare() { + default + mv Makefile.linux Makefile || die + + # Prevent gzipping manpage. + sed -i -e '/gzip/d' Makefile || die +} + +src_configure() { + local -a opts + opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + ) + + emake CONFIG_OPTIONS="${opts[*]}" config.h +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN} +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest index 6f80df21fb96..1e51863270f9 100644 --- a/net-misc/nemesis/Manifest +++ b/net-misc/nemesis/Manifest @@ -1,8 +1,6 @@ -AUX 1.4-libnet-1.0.patch 6278 BLAKE2B 481287457b392d86c4d9c55a12c66d5dfb5b1373e1aeacb8aeeb11bb620b92e74d3d3fbf60aca100481963a0adb608bebee4c0fa8587df2c4ed410e6f942decc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2 AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5d831663590a63e97aef9cc68668dd242610a996f19736bba409e6c36fdc2a3a3897cb18f656a2081c7f58d64e SHA512 3bfc30e047eaa493d47ef1dbc1e6940746b347f64c60c210a68db47774c169b2eaeedcaba84eff2fe16fca656d613819218b5f2afe52b97f0d0152cf00a65a3f AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9 AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8 -EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B f9c7e0bfc12c5454ecb735171f698ddfe9aee49b95e55a2b4177489b382ce423c7c467bc867260cb45f026a9e3eb3333749a57b5e0d77c3afc3299d38eeae98e SHA512 f8a01c0e2b031ecb40d161aeecc83bd3931a21185ffdb3fe8c1cc83a0332f1f225405e65d0efb13de18276abea8be80b982f05d5ae7774fd6eb6e8a1029e25a2 -EBUILD nemesis-1.4.ebuild 641 BLAKE2B 1af51134b80b35c76dee9ec2252f6aef05eee025e93d58f031d3d8bf747b70bf8ed263824266f019ab01589f36638400e38b5d14eed7d9a3a9766c74581678e6 SHA512 b726b9295600019b56bf84e2501fee4a5587ba75351ddf969594edca68b71eddd253affd5e318893c8409069064c0df47226156b1715e2c2c4a0560c518ef081 +EBUILD nemesis-1.4-r1.ebuild 625 BLAKE2B 12c3fa61d7fd39ae885d63a2371e4d0065d0f1a176f126d00e0af1ec8fe810c00063f44623bc554ed77250cdd3d1c0a5b907b0b63ee5c525cb3ddf3b61edc43f SHA512 580e5b8a62e664cd408cfb23b8fa1baa5c715addd2ac8c873295da51bbcb720b5bdc3afe0f6a8e0d19f9ed5493599aa1fd64ac1d9ab170d12807ba42fc9dabc2 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc diff --git a/net-misc/nemesis/files/1.4-libnet-1.0.patch b/net-misc/nemesis/files/1.4-libnet-1.0.patch deleted file mode 100644 index b4c55c374efa..000000000000 --- a/net-misc/nemesis/files/1.4-libnet-1.0.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- nemesis-1.4.orig/configure 2006-12-15 13:56:46.000000000 -0700 -+++ nemesis-1.4/configure 2006-12-15 14:17:33.000000000 -0700 -@@ -4150 +4150 @@ --CPPFLAGS="${CPPFLAGS} `libnet-config --defines`" -+CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`" -@@ -4153 +4153 @@ --if test `libnet-config --cflags | wc -c` = "1"; then -+if test `libnet-1.0-config --cflags | wc -c` = "1"; then -@@ -4157 +4157 @@ -- CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`" -+ CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`" -@@ -4160,3 +4160,3 @@ --if test `libnet-config --libs | wc -c` = "1"; then -- { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5 --echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;} -+if test `libnet-1.0-config --libs | wc -c` = "1"; then -+ { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5 -+echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;} -@@ -4167 +4167 @@ -- LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`" -+ LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`" -@@ -4712,2 +4712,2 @@ --echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5 --echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5 -+echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6 -@@ -4718 +4718 @@ --LIBS="-lnet $LIBS" -+LIBS="-lnet-1.0 $LIBS" -@@ -4781 +4781 @@ -- LIBS="-lnet $LIBS" -+ LIBS="-lnet-1.0 $LIBS" -@@ -5263 +5263 @@ --for ac_header in libnet.h -+for ac_header in libnet-1.0.h -@@ -5433 +5433 @@ -- libnet_dir=`libnet-config --cflags | cut -dI -f2` -+ libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` -@@ -5438 +5438 @@ -- if test -r $i/libnet.h; then -+ if test -r $i/libnet-1.0.h; then -@@ -5444 +5444 @@ -- if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then -+ if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then -@@ -5455 +5455 @@ -- echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" -+ echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" -@@ -5474 +5474 @@ -- echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" -+ echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-arp.h nemesis-1.4beta3/src/nemesis-arp.h ---- nemesis-1.4beta3.orig/src/nemesis-arp.h 2003-08-19 15:45:45.675664688 -0400 -+++ nemesis-1.4beta3/src/nemesis-arp.h 2003-08-19 15:47:07.631205552 -0400 -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-dns.h nemesis-1.4beta3/src/nemesis-dns.h ---- nemesis-1.4beta3.orig/src/nemesis-dns.h 2003-08-19 15:45:45.675664688 -0400 -+++ nemesis-1.4beta3/src/nemesis-dns.h 2003-08-19 15:47:07.638204488 -0400 -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ethernet.h nemesis-1.4beta3/src/nemesis-ethernet.h ---- nemesis-1.4beta3.orig/src/nemesis-ethernet.h 2003-08-19 15:45:45.676664536 -0400 -+++ nemesis-1.4beta3/src/nemesis-ethernet.h 2003-08-19 15:47:07.641204032 -0400 -@@ -29 +29 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-functions.c nemesis-1.4beta3/src/nemesis-functions.c ---- nemesis-1.4beta3.orig/src/nemesis-functions.c 2003-08-19 15:45:45.676664536 -0400 -+++ nemesis-1.4beta3/src/nemesis-functions.c 2003-08-19 15:47:07.656201752 -0400 -@@ -37 +37 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-icmp.h nemesis-1.4beta3/src/nemesis-icmp.h ---- nemesis-1.4beta3.orig/src/nemesis-icmp.h 2003-08-19 15:45:45.676664536 -0400 -+++ nemesis-1.4beta3/src/nemesis-icmp.h 2003-08-19 15:47:07.665200384 -0400 -@@ -31 +31 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-igmp.h nemesis-1.4beta3/src/nemesis-igmp.h ---- nemesis-1.4beta3.orig/src/nemesis-igmp.h 2003-08-19 15:45:45.676664536 -0400 -+++ nemesis-1.4beta3/src/nemesis-igmp.h 2003-08-19 15:47:07.670199624 -0400 -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ip.h nemesis-1.4beta3/src/nemesis-ip.h ---- nemesis-1.4beta3.orig/src/nemesis-ip.h 2003-08-19 15:45:45.676664536 -0400 -+++ nemesis-1.4beta3/src/nemesis-ip.h 2003-08-19 15:47:07.677198560 -0400 -@@ -26 +26 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ospf.h nemesis-1.4beta3/src/nemesis-ospf.h ---- nemesis-1.4beta3.orig/src/nemesis-ospf.h 2003-08-19 15:45:45.677664384 -0400 -+++ nemesis-1.4beta3/src/nemesis-ospf.h 2003-08-19 15:47:07.684197496 -0400 -@@ -33 +33 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-rip.h nemesis-1.4beta3/src/nemesis-rip.h ---- nemesis-1.4beta3.orig/src/nemesis-rip.h 2003-08-19 15:45:45.678664232 -0400 -+++ nemesis-1.4beta3/src/nemesis-rip.h 2003-08-19 15:47:07.717192480 -0400 -@@ -33 +33 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-tcp.h nemesis-1.4beta3/src/nemesis-tcp.h ---- nemesis-1.4beta3.orig/src/nemesis-tcp.h 2003-08-19 15:45:45.678664232 -0400 -+++ nemesis-1.4beta3/src/nemesis-tcp.h 2003-08-19 15:47:07.723191568 -0400 -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-udp.h nemesis-1.4beta3/src/nemesis-udp.h ---- nemesis-1.4beta3.orig/src/nemesis-udp.h 2003-08-19 15:45:45.678664232 -0400 -+++ nemesis-1.4beta3/src/nemesis-udp.h 2003-08-19 15:47:07.728190808 -0400 -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis.h nemesis-1.4beta3/src/nemesis.h ---- nemesis-1.4beta3.orig/src/nemesis.h 2003-08-19 15:45:45.678664232 -0400 -+++ nemesis-1.4beta3/src/nemesis.h 2003-08-19 15:47:07.731190352 -0400 -@@ -15 +15 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- nemesis-1.4.orig/src/nemesis-printout.c 2006-12-15 13:56:46.000000000 -0700 -+++ nemesis-1.4/src/nemesis-printout.c 2006-12-15 14:47:14.000000000 -0700 -@@ -34 +34 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild index 2728a521e68c..10d1e02a2814 100644 --- a/net-misc/nemesis/nemesis-1.4-r1.ebuild +++ b/net-misc/nemesis/nemesis-1.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 sparc x86" +KEYWORDS="alpha amd64 sparc x86" RDEPEND=" net-libs/libpcap diff --git a/net-misc/nemesis/nemesis-1.4.ebuild b/net-misc/nemesis/nemesis-1.4.ebuild deleted file mode 100644 index 0b7ee6fd346c..000000000000 --- a/net-misc/nemesis/nemesis-1.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils - -DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux" -HOMEPAGE="http://nemesis.sourceforge.net/" -SRC_URI="mirror://sourceforge/nemesis/${P/_}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 sparc x86" -IUSE="" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - =net-libs/libnet-1.0*" - -S=${WORKDIR}/${P/_} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PV}-libnet-1.0.patch -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc CREDITS ChangeLog INSTALL README -} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index d5fa3cd011df..75892fdc0739 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,10 +2,8 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658 -DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7 DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584 -EBUILD networkmanager-1.14.4.ebuild 10961 BLAKE2B 8b80e2ef690c5ad568207e4a979929b83dec81e2b842f0c480f0ed2c93f15f2e46f66833c6f6368b1514a0b6b4bdd05cffd268ca0bb9c238971100cb4039a546 SHA512 33f60cd12c1d582c5153ebd5df9d0ceeb1b24f318091307085ee058c44bb17fca280b45f8e4af0759c54b813436a88468419a607d14f53406487d642c42cc6e7 -EBUILD networkmanager-1.14.6.ebuild 10962 BLAKE2B 451a738b84a61d29539925cabbd6b6ce452c0cfb7ad3108879bcf00dc4ab3461c38df20ff81282ef8f3ddf2ea79e8ce87e557300e3fe82c5f79908a46c6e4326 SHA512 7de4542451ed42b23d81e724ed4840350d0df0151667f0e6239437d85c1eb42a64dfea2411262dca1be2d61d58a111b3afcd3c6885d44417df47256579eaa98c -EBUILD networkmanager-1.16.0.ebuild 11118 BLAKE2B 66cfd9975554f7d151d824ff2434837d83cc4d0bc53b1010a27cd93c33d5c8b0ae110007a0ab74e098ebec36d244fcda7b956ae1c5ab7187696f1e58b9313b07 SHA512 29aa818a18eb39fab1ed7abffe5951bf57d5affdbb6f58998a44d9a6e8fe96b2a12a5d082f109681e22c1554fa9bf874ebae8ed181f550054a13e9e1df32c110 +EBUILD networkmanager-1.14.6.ebuild 10961 BLAKE2B ba38ca50957abd14cb4b965e72a1a249267d5ded23cc7d766f1cc2ff2bda6ff5583fb66124eddbd45c3f62eca650c6094d7a637196b0c4acf392e576445595f0 SHA512 6dbba3c0a1fa478b5f3599b97101eee08c7d347409235ce49b72d6cf857da064ceee394afd8820e59237f788b2442ab4e7f5bb411b659dbdb495fba190e567ef +EBUILD networkmanager-1.16.0.ebuild 11117 BLAKE2B 384576bd739fd63f9c7ec834d858115b79605049a49dc182d59b155f058c79a50797993fcdf846ab191e3d611cdc2363eee8dc1d5a3208977240b689a89d80be SHA512 f7df02ffea404047363ff706e4b412d3af7851758d870115a8e09c9520677e6453c5d1e10fa120204fd99cd890de23d01797c6804d7096706654db797f053fe7 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0 diff --git a/net-misc/networkmanager/networkmanager-1.14.4.ebuild b/net-misc/networkmanager/networkmanager-1.14.4.ebuild deleted file mode 100644 index e613de346121..000000000000 --- a/net-misc/networkmanager/networkmanager-1.14.4.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version - -IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" - -REQUIRED_USE=" - iwd? ( wifi ) - modemmanager? ( ppp ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( nss gnutls ) - ?? ( consolekit elogind systemd ) -" - -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) - elogind? ( >=sys-auth/elogind-219 ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-2.6.29 - virtual/pkgconfig[${MULTILIB_USEDEP}] - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - linux-info_pkg_setup - fi - enewgroup plugdev - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --disable-lto - --disable-config-plugin-ibft - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are - # still not ready for removing that lib, bug #665338 - --with-libnm-glib - --with-nmcli=yes - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - $(multilib_native_enable concheck) - --with-crypto=$(usex nss nss gnutls) - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - $(use_with dhclient) - $(use_with dhcpcd) - $(multilib_native_use_enable introspection) - $(use_enable json json-validation) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - if multilib_is_native_abi && use policykit; then - myconf+=( --enable-polkit=yes ) - else - myconf+=( --enable-polkit=disabled ) - fi - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - libnm-util/libnm-util.la - libnm-glib/libnm-glib.la - libnm-glib/libnm-glib-vpn.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - else - local targets=( - install-libLTLIBRARIES - install-libdeprecatedHEADERS - install-libnm_glib_libnmvpnHEADERS - install-libnm_glib_libnmincludeHEADERS - install-libnm_util_libnm_util_includeHEADERS - install-libnmincludeHEADERS - install-nodist_libnm_glib_libnmincludeHEADERS - install-nodist_libnm_glib_libnmvpnHEADERS - install-nodist_libnm_util_libnm_util_includeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.14.6.ebuild b/net-misc/networkmanager/networkmanager-1.14.6.ebuild index d04bc3811935..ba1e91e55b72 100644 --- a/net-misc/networkmanager/networkmanager-1.14.6.ebuild +++ b/net-misc/networkmanager/networkmanager-1.14.6.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" ?? ( consolekit elogind systemd ) " -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild index c4d8b313b97e..bc78cf88dcb4 100644 --- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild +++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" ?? ( consolekit elogind systemd ) " -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 9a2fb38632f2..d7fec682b413 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -21,7 +21,9 @@ 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-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-glue-12.0.patch 825 BLAKE2B 9fc0b5b291551d55770bddcf23d44601d15cbc23a6d8f0795cd064f53e1bc2e49056b23b2d7db0aa25e31e8b68c71ef476cb926a7efa765edf81440489711225 SHA512 edd8c0bdc3b90f7afce8eb5d91ec1344b6e22fc9d16787f63eaee9a576178f5e0b4937fb0dc2640779c049a9102ece63360fef4f690b09894ec46995e0f5ebe2 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 @@ -51,6 +53,7 @@ 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-sctp-1.2.patch.xz 7348 BLAKE2B bc3d3815f1ef5dbab605b93182a00c2fec258f49d56684defb6564d2b60886429c615a7ab076cc071a590f9df0908b1862ceb0961b7e6f6d1090237fec9035d3 SHA512 2f9f774286db75d0240e6fb01655a8a193fb2a5dc4596ad68ed22d64f97c9c46dad61a06478f2e972fd37cbad4d9aca5829bb91097cc56638601ff94a972b24f DIST openssh-8.0p1.tar.gz 1597697 BLAKE2B 5ba79872eabb3b3964d95a8cdd690bfe0323f018d7f944d4e1acb52576c9f6d7a1ddac15e88dc42eac6ecbfabfad1c228e303a2262588769e307c38107a4cd54 SHA512 e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982 @@ -58,5 +61,6 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5 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 16291 BLAKE2B 2a766c87f8c9b696a6453e0e84b7cb2dd2d86c15d1e7bbe20bff2ce2725aa39977df1d70be9efcb45a2e39a37fee784b9a71064fa21528b2635d4fadb2952814 SHA512 d46aab38c2f426a03eb6b4f01ceb63baeffc587145100500c615999da1a88a19d359533de796f0e0357a42edaa80d8306447f28f6f2b0fcd0ea86c7ce3e5a036 +EBUILD openssh-8.0_p1-r1.ebuild 16147 BLAKE2B 3dbc47053a0ae6db338da198ad68a00525c24019a6a2d4eadd51d6611f8fbd373aee4ddf7bea2e22f552dd4d70552ed8e2a2783380ea971021a83331a107ea12 SHA512 b1336baeb49cda64abbf21805fb9383d1978fb24efc8c85a5fc93c34053ea21c088531c9287da01078b36fcf83380b36391c3e613a1f7c259424a4d579f5eb97 EBUILD openssh-8.0_p1.ebuild 16116 BLAKE2B 7e98c38ad62d00c7e2155412ee992c07eea7d62bc60ebe51d897a5079a41f2cc86d871696e5e47ae4c618ce8a170f165a1cf0544b48afebd73b2514b4729b738 SHA512 bf6a0b010f0b511718c29f825f4f8c17223117be550ce9c78895e35986cd2ea4c1fa352e71c259a808ff4cf41ef9a43e9b2ace26ad423ce1288465c4cf0bcb9d 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 new file mode 100644 index 000000000000..e4aca305e005 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.1.patch @@ -0,0 +1,16 @@ +--- 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 new file mode 100644 index 000000000000..244aef4c3992 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.1.patch @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..333774349e2c --- /dev/null +++ b/net-misc/openssh/openssh-8.0_p1-r1.ebuild @@ -0,0 +1,461 @@ +# 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 ~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 + use elibc_musl && use x86 && 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/rclone/Manifest b/net-misc/rclone/Manifest index c1a182bea8d4..08d95d9d9ce9 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -1,6 +1,6 @@ -DIST rclone-1.44.tar.gz 16362501 BLAKE2B 28b4e444b83f361ae641eb7b09e150d46eaac09dd777e247e38f3e708a18e8e58d6a1c40829aba1c44c6c37e733dced2eae069a9b6e725adf0785b7c9959e47b SHA512 1207316ed12646a4ec5f9795d5cca1de9d2fa333f60a8b6dd157462813e2e6ad9ebf85d3d20b9b881d11dcd9ac162b5a674a53ff2af15a452afcfc04f7b34f5b DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55fea47a5f76773f1dcc3d3b629cca7964ffe41aa1e4dbd2fe36bd80545f336d2823a25ebb6b3effc768d4b46d2 SHA512 348dbd6a069f736219b7f925b6aa5234a4d70724ee5bfdb56067241063be36c44a091a37acb3285627803fa013329a6ef804aab4c0070ddaf322c5324b9e2a5a -EBUILD rclone-1.44.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a -EBUILD rclone-1.45.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356 +DIST rclone-1.47.0.tar.gz 17282254 BLAKE2B 57c4f3576427778db0fdc523d8b95b33db5cebfb0081d927abc8925eeaf90c0d2079f1d9572e81faac41e98cfee3028f39c9aed89e6db17188efb3541e3daa6a SHA512 90e68021f589bfad95989b45d91c47da63066e9bc60040052e866d1c7e420bc2784335cc5dbab0e4372c4f8686acb0a65853877c41081c8406eddada42550125 +EBUILD rclone-1.45.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a +EBUILD rclone-1.47.0.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356 EBUILD rclone-9999.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46 diff --git a/net-misc/rclone/rclone-1.45.ebuild b/net-misc/rclone/rclone-1.45.ebuild index e1f64b65bde7..e7c1175ae163 100644 --- a/net-misc/rclone/rclone-1.45.ebuild +++ b/net-misc/rclone/rclone-1.45.ebuild @@ -8,7 +8,7 @@ EGO_PN="github.com/ncw/${PN}" if [[ ${PV} == *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" EGIT_COMMIT="v${PV}" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/net-misc/rclone/rclone-1.44.ebuild b/net-misc/rclone/rclone-1.47.0.ebuild index e7c1175ae163..e1f64b65bde7 100644 --- a/net-misc/rclone/rclone-1.44.ebuild +++ b/net-misc/rclone/rclone-1.47.0.ebuild @@ -8,7 +8,7 @@ EGO_PN="github.com/ncw/${PN}" if [[ ${PV} == *9999* ]]; then inherit golang-vcs else - KEYWORDS="amd64 ~arm x86" + KEYWORDS="~amd64 ~arm ~x86" EGIT_COMMIT="v${PV}" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 6b56108cc180..a7c04f1deb23 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -5,5 +5,5 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 -EBUILD rsync-3.1.3.ebuild 2809 BLAKE2B 2033c22dd22d16b47f5c1cda65d3aed3a5b6fa598e844b75a4ff8334fac343d188a37a03f4c2168fcb00033e20d0b77ecb23f47d1f930efff99e366a8b9c66c6 SHA512 779c45768731f75c3e4902cdb156eb60be75662499b41745a9a2fc2b951fc0e3d73c5d836052a7b2677dc79b670943964ab2793ad9b04e37a2657ca9bc750f76 +EBUILD rsync-3.1.3.ebuild 2813 BLAKE2B 303593f4f796d56b32425375b0083b9e302d0ec7e80e234db7d2210557ccfda4c378a7ee841793f7740dc79a464daa4b052ebe688105d89be04c749ac5ed17b2 SHA512 0275900a429cb9ec97dfa4f6d73b39719137ed61bd8ec1f69ce8b1c31f29289958512152a62fb0a98f59cdea0f46cd5d5ef199c709b36e460c9318e1836ef6cb MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild index 26945c94656f..f995987634d6 100644 --- a/net-misc/rsync/rsync-3.1.3.ebuild +++ b/net-misc/rsync/rsync-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" [[ ${PV} = *_pre* ]] || \ -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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" +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" IUSE="acl examples iconv ipv6 static stunnel xattr" LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 872cacd0f5ec..7f2a455a5739 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,10 +1,7 @@ AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6 -AUX stunnel-5.39-compat-libressl.patch 5329 BLAKE2B b88f615e88940dc091c264b34ef3c71701e120cc907bd438cb6966b1b720fd9dd8b8bcab5235519b0eefaa1576e37cc8b4c9887cf4d6a2330ba5461347f6ded7 SHA512 a6390e1452f0cf7f2867b28ebc36e0b4f9f6ab8985b03f182625d1970a9bbc0228addaa966feb3c0df8925191b73fdaf48e1e65aef68d3d62962fd28760b3578 AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3 -AUX stunnel-5.48-compat-libressl.patch 4845 BLAKE2B 0c6bc9059902be43970a78269632dcdbb82a9e07a6cfa8dca6b960f79832953a7d7173097c74a24ccad8c59deca1353887519cfde107b22d10422204bb83e9cf SHA512 b03277b8487fc9cd763c11e0b32c3755dd4aea76ecc21238204d4f27f03b5cfc72ee7ab148aa813a6eb21bb588d8dadc2b0610049175fa1278e799681a946098 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4 AUX stunnel-5.51-libressl.patch 10288 BLAKE2B f403d620b6b1341d3934e560d8d7e81fb6567c5076c3c46a34ebafe7136d95e2c9bf0f1d56818384040e0dcf5a1a4e1e10afe29db1f32ff2008cef30b83a8da5 SHA512 d8c8562afeaed5a8843e08d50a5097a4e36a10a014ebe281d8ea0bc563ac5b9bfa9d884f8cf6008b58bf679a7e785d86b331cddcb0bd5e49ed664763d9b3e597 -AUX stunnel-compat-libressl.patch 1871 BLAKE2B e7545ae95b173b868fff7159a681497655f8c80c994add9901a752787d2c51728c994ef940f540abc7538585b51ca4de41ddd20e0f929330188ffd2e0d2ded78 SHA512 590f6be1962ef3ca1c8f1c64c02b1e63b7211a2ba5cb5fd4eb09127e45ee5251a7ec701aae3eda25e34caa1977378ad5f7b75e826aee7d9d5ff8b9acbd298f36 AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb diff --git a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch b/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch deleted file mode 100644 index 7c4f74351838..000000000000 --- a/net-misc/stunnel/files/stunnel-5.39-compat-libressl.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c ---- stunnel-5.30.orig/src/ctx.c 2016-01-15 16:45:23.000000000 +0000 -+++ stunnel-5.30/src/ctx.c 2016-05-14 15:16:47.392859450 +0000 -@@ -359,7 +359,7 @@ - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; -diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c ---- stunnel-5.30.orig/src/verify.c 2016-01-15 16:45:23.000000000 +0000 -+++ stunnel-5.30/src/verify.c 2016-05-14 15:16:10.369860180 +0000 -@@ -51,7 +51,7 @@ - NOEXPORT int verify_callback(int, X509_STORE_CTX *); - NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *); - NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int); --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *); - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ - NOEXPORT int cert_check_local(X509_STORE_CTX *); -@@ -280,7 +280,7 @@ - } - - if(depth==0) { /* additional peer certificate checks */ --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if(!cert_check_subject(c, callback_ctx)) - return 0; /* reject */ - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ -@@ -291,7 +291,7 @@ - return 1; /* accept */ - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) { - X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx); - NAME_LIST *ptr; -diff --git a/src/common.h b/src/common.h -index 93f165e..491d9de 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -448,7 +448,7 @@ extern char *sys_errlist[]; - #define OPENSSL_NO_TLS1_2 - #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_SSL2 - #define OPENSSL_NO_SSL2 - #endif /* !defined(OPENSSL_NO_SSL2) */ -@@ -474,7 +474,7 @@ extern char *sys_errlist[]; - #include <openssl/des.h> - #ifndef OPENSSL_NO_DH - #include <openssl/dh.h> --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); - #endif /* OpenSSL older than 1.1.0 */ - #endif /* !defined(OPENSSL_NO_DH) */ -diff --git a/src/prototypes.h b/src/prototypes.h -index 303ff77..ae22598 100644 ---- a/src/prototypes.h -+++ b/src/prototypes.h -@@ -664,13 +664,13 @@ typedef enum { - #endif /* OPENSSL_NO_DH */ - STUNNEL_LOCKS /* number of locks */ - } LOCK_TYPE; --#if OPENSSL_VERSION_NUMBER < 0x10100004L -+#if OPENSSL_VERSION_NUMBER < 0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - typedef int STUNNEL_RWLOCK; - #else - typedef CRYPTO_RWLOCK *STUNNEL_RWLOCK; - #endif - extern STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS]; --#if OPENSSL_VERSION_NUMBER>=0x10100004L -+#if OPENSSL_VERSION_NUMBER>=0x10100004L && !defined(LIBRESSL_VERSION_NUMBER) - #define CRYPTO_THREAD_read_unlock(type) CRYPTO_THREAD_unlock(type) - #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type) - #else -diff --git a/src/ssl.c b/src/ssl.c -index a7af7e6..1483734 100644 ---- a/src/ssl.c -+++ b/src/ssl.c -@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const char *); - int index_cli, index_opt, index_redirect, index_addr; - - int ssl_init(void) { /* init TLS before parsing configuration file */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | - OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); - #else -@@ -83,7 +83,7 @@ int ssl_init(void) { /* init TLS before parsing configuration file */ - } - - #ifndef OPENSSL_NO_DH --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0 - * to be linked against the older versions */ - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { -diff --git a/src/sthreads.c b/src/sthreads.c -index 59c24a2..04fb256 100644 ---- a/src/sthreads.c -+++ b/src/sthreads.c -@@ -47,7 +47,7 @@ - STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS]; - #endif - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - #define CRYPTO_THREAD_lock_new() CRYPTO_get_new_dynlockid() - #endif - -diff --git a/src/verify.c b/src/verify.c -index ac1c3ee..3e3bda4 100644 ---- a/src/verify.c -+++ b/src/verify.c -@@ -348,7 +348,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) { - cert=X509_STORE_CTX_get_current_cert(callback_ctx); - subject=X509_get_subject_name(cert); - --#if OPENSSL_VERSION_NUMBER>=0x10000000L -+#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER) - #if OPENSSL_VERSION_NUMBER<0x10100006L - #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs - #endif diff --git a/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch b/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch deleted file mode 100644 index 3161b1581b1a..000000000000 --- a/net-misc/stunnel/files/stunnel-5.48-compat-libressl.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Naur stunnel-5.48.orig/src/common.h stunnel-5.48/src/common.h ---- stunnel-5.48.orig/src/common.h 2018-06-08 13:30:15.000000000 -0400 -+++ stunnel-5.48/src/common.h 2018-07-08 22:23:00.527131463 -0400 -@@ -446,7 +446,7 @@ - #define OPENSSL_NO_TLS1_2 - #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_SSL2 - #define OPENSSL_NO_SSL2 - #endif /* !defined(OPENSSL_NO_SSL2) */ -@@ -473,7 +473,7 @@ - #include <openssl/des.h> - #ifndef OPENSSL_NO_DH - #include <openssl/dh.h> --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); - #endif /* OpenSSL older than 1.1.0 */ - #endif /* !defined(OPENSSL_NO_DH) */ -diff -Naur stunnel-5.48.orig/src/ctx.c stunnel-5.48/src/ctx.c ---- stunnel-5.48.orig/src/ctx.c 2018-07-02 17:30:10.000000000 -0400 -+++ stunnel-5.48/src/ctx.c 2018-07-08 22:23:00.527131463 -0400 -@@ -311,7 +311,7 @@ - - #ifndef OPENSSL_NO_DH - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) { - return ctx->cipher_list; - } -@@ -414,7 +414,7 @@ - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; -diff -Naur stunnel-5.48.orig/src/options.c stunnel-5.48/src/options.c ---- stunnel-5.48.orig/src/options.c 2018-07-02 17:30:26.000000000 -0400 -+++ stunnel-5.48/src/options.c 2018-07-08 22:23:00.527131463 -0400 -@@ -4215,7 +4215,7 @@ - } - #endif - /* engines can add new algorithms */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS| - OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); - #else -diff -Naur stunnel-5.48.orig/src/ssl.c stunnel-5.48/src/ssl.c ---- stunnel-5.48.orig/src/ssl.c 2018-04-06 10:25:10.000000000 -0400 -+++ stunnel-5.48/src/ssl.c 2018-07-08 22:23:00.527131463 -0400 -@@ -52,7 +52,7 @@ - int index_session_authenticated, index_session_connect_address; - - int ssl_init(void) { /* init TLS before parsing configuration file */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | - OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL); - #else -@@ -88,7 +88,7 @@ - } - - #ifndef OPENSSL_NO_DH --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0 - * to be linked against the older versions */ - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { -diff -Naur stunnel-5.48.orig/src/verify.c stunnel-5.48/src/verify.c ---- stunnel-5.48.orig/src/verify.c 2018-07-02 17:30:10.000000000 -0400 -+++ stunnel-5.48/src/verify.c 2018-07-08 22:23:00.531131344 -0400 -@@ -51,7 +51,7 @@ - NOEXPORT int verify_callback(int, X509_STORE_CTX *); - NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *); - NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int); --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *); - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ - NOEXPORT int cert_check_local(X509_STORE_CTX *); -@@ -285,7 +285,7 @@ - } - - if(depth==0) { /* additional peer certificate checks */ --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if(!cert_check_subject(c, callback_ctx)) - return 0; /* reject */ - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ -@@ -296,7 +296,7 @@ - return 1; /* accept */ - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) { - X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx); - NAME_LIST *ptr; -@@ -346,7 +346,7 @@ - cert=X509_STORE_CTX_get_current_cert(callback_ctx); - subject=X509_get_subject_name(cert); - --#if OPENSSL_VERSION_NUMBER<0x10100006L -+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) - #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs - #endif - /* modern API allows retrieving multiple matching certificates */ diff --git a/net-misc/stunnel/files/stunnel-compat-libressl.patch b/net-misc/stunnel/files/stunnel-compat-libressl.patch deleted file mode 100644 index 1349484bf3df..000000000000 --- a/net-misc/stunnel/files/stunnel-compat-libressl.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur stunnel-5.30.orig/src/ctx.c stunnel-5.30/src/ctx.c ---- stunnel-5.30.orig/src/ctx.c 2016-01-15 16:45:23.000000000 +0000 -+++ stunnel-5.30/src/ctx.c 2016-05-14 15:16:47.392859450 +0000 -@@ -359,7 +359,7 @@ - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; -diff -Naur stunnel-5.30.orig/src/verify.c stunnel-5.30/src/verify.c ---- stunnel-5.30.orig/src/verify.c 2016-01-15 16:45:23.000000000 +0000 -+++ stunnel-5.30/src/verify.c 2016-05-14 15:16:10.369860180 +0000 -@@ -51,7 +51,7 @@ - NOEXPORT int verify_callback(int, X509_STORE_CTX *); - NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *); - NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int); --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *); - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ - NOEXPORT int cert_check_local(X509_STORE_CTX *); -@@ -280,7 +280,7 @@ - } - - if(depth==0) { /* additional peer certificate checks */ --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if(!cert_check_subject(c, callback_ctx)) - return 0; /* reject */ - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ -@@ -291,7 +291,7 @@ - return 1; /* accept */ - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) { - X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx); - NAME_LIST *ptr; diff --git a/net-misc/stuntman/Manifest b/net-misc/stuntman/Manifest index a7609ed6d96b..9543dcd70dae 100644 --- a/net-misc/stuntman/Manifest +++ b/net-misc/stuntman/Manifest @@ -1,7 +1,9 @@ AUX stuntman.confd 403 BLAKE2B 203ee17a4ae188486d8b8fc431d2cbf29eb821f5f2b0bff3dffa4854b4d2402c255561f18024041a2bb6fa1abe0797b9b3d1f0c7e125f5ccd910142525a63556 SHA512 eeb3d8cc7299cf0d42c5fc111207685bfd2e722dd4389f7fb37250313e9cf3c91d0037b19723bb1018a54daca677fe60f65aa8b5f7fff70e4f6325dc9b7e1e66 AUX stuntman.initd 272 BLAKE2B 2be96dcc81b0681bba279341c5d25ea30b56e5698007d1dfa53c057ce5ed0a5ef1c53b0b34365a8c36160a59ebff3053b61e37d3598e2edbcdc9748b6761cebc SHA512 e8cb2d80573a57e582f4fd68f3772a93c74eb7abf96539acb1441eb1e94a6dcc7fad84f65d13d7ca7a4130801b69af9314fc78c4089c6d0f05a3b0366abedb18 +DIST stunserver-1.2.15.tgz 124675 BLAKE2B fc59a400dea30382aec80d6b634ed7c2a1823712788b7775c1bbf8511fa62173224084ae9b05a402e0efb11f0077087e515d9639eb9eec5d0ced48ce37c20cef SHA512 8af5341cd3a78bd3a68f75e2da1b6d5e75de94c9baa4f48824667e2c50f9b8323a60d33711c658c7e628e2a170cea7584e4d4012603736ad7140fe1a37ad9b66 DIST stunserver-1.2.7.tgz 113853 BLAKE2B b4da41c46d2017da76b21544bae9eaba4deb25d50145829d92fa18fb8e2c5eec6b81c54a3c91f592686c73c0ef66dfde0e74fe34e82a1eac320455d0808eb7a6 SHA512 b6adc1b237e8717f296201bf865bea39c759b978db954cc15e37c3be7c2e109607273d96bb88c42654d0b843ca1a557874d02ab58e16506534db30f52d7e6f51 DIST stunserver-1.2.9.tgz 116797 BLAKE2B 16a380c9dd002f9ededa5cc7ea757087b2c5199144c8b6cff2c429ce6f77741d7f18a1ed12e9035c1f77f7c1546adb95ceaad744780347f035a1b302637de442 SHA512 8e947dbe050f70e10615a23900dbd2151cd9fad36e343b4cf34c0b7a4e07debb8ced16fb7eac0469cd5ec3ef7a4c04cb9347f59c2a1326af3db400906198454f +EBUILD stuntman-1.2.15.ebuild 658 BLAKE2B 85e189a811bbaadc35977214e4cd6241cc5fbc243b060ddddf3075424456aa69881ab5d41cfb4af07dbf9471e887caf8c948ef5cd0135adff3fe3b17c436f82f SHA512 24ce4620a1e0602276cfc8ee0f953330d11347cb7354bf67d8040d010989c2dd4bb2163bdff4ec4a11b23daa731d4de4f04370fa6b7361dc5a1d51a2b7f947fb EBUILD stuntman-1.2.7.ebuild 670 BLAKE2B 6b90a9d051b79b90696c09a1bf4043c970c66c9c37fa47f0e46a30c0a2ed8bb5b7426fe0ec9ac34a1e1c1f7d2030661818c2149ee460b0e3d283321f05824d24 SHA512 df2401d9d371e122ebdfb99c2e3d51473f85f2b4f117d24725f52dd7175b8964c75722a33d8a732bbfe23768a23c130c4cd1f61e71913e1a187af68def0eacd2 EBUILD stuntman-1.2.9.ebuild 670 BLAKE2B 161b77e236403b796d6d23b45a509bd4dd52ab8e91ff9deee80f7b5b692388c664f772d19308c7eab5f2e48561aab3ef8c5e8b18a2ceab4b42ade45737f0358d SHA512 f8b38864ac8d046bd19599ed8970330eb0f5e9c4b2d5c42bf3c66bc0d33616ee4a8c96c428392bb56168321f84424135afeceb4c159842c65bab067cc37334ac MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd diff --git a/net-misc/stuntman/stuntman-1.2.15.ebuild b/net-misc/stuntman/stuntman-1.2.15.ebuild new file mode 100644 index 000000000000..4801a72bba39 --- /dev/null +++ b/net-misc/stuntman/stuntman-1.2.15.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Open source implementation of the STUN protocol" +HOMEPAGE="http://www.stunprotocol.org" +SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/openssl:0= +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +S="${WORKDIR}/stunserver" + +src_compile() { + emake T="" +} + +src_install() { + dobin stunclient + dosbin stunserver + dodoc HISTORY README + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} +} + +src_test() { + ./stuntestcode +} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index ef30215ef6c3..80be4a53312e 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,4 @@ -DIST youtube-dl-2019.04.17.tar.gz 3146625 BLAKE2B 35f49bcb56daa3ddbeeaaab57e4be259ddd2ebd1b21f797098fecb33fc0e153947558406f91878e2bb2d2627c950b4e670dbde35a148f1c216e46d366a7bb462 SHA512 6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148 -DIST youtube-dl-2019.04.24.tar.gz 3152789 BLAKE2B a90bc795d80c1dd50910288eead0646ffb0757afe911e3d3429b7ad20bcb9a494e12c341833731cbaf7009e0aef9d30695cf8e8c4e4688950709e96b02f10aff SHA512 44fa60c4e62bcc8d81908d600349ad89b1123262c942fe206d5966e7e2e59aca94d13e56bfac61b8be6da365316634aeb057b3d6055d6ff8b57addc1597d8fa3 -EBUILD youtube-dl-2019.04.17.ebuild 2113 BLAKE2B ad2c7e843bf3f0ed831f112fd8db7eef33694b2140ecfbe2c521eed0e87fac4f1bda7dca048d21c47656c974b6537f5239b7fa21cad19c2725adb689f819b841 SHA512 06b5c65494bd6ec422d72f2478e44251a86eba81284b8d1a29c0ff2e6c0d380f5b0f9c16c8971ddbc39d4604892c53b6ac9678c4bb2838ecf8df3810f27bda74 -EBUILD youtube-dl-2019.04.24.ebuild 2119 BLAKE2B 97242d14fb3198185ef70123182c2def274cc0101555a13a447622c30baee2451ad611d6c2d211987abc56869830f4cfc2f4989d7f8f658d382af94f6adb335f SHA512 029ba27247f94c345be98f6262fefc616a6bf1e268c7103f73f2b513fbede75d64d920e4891127a93f5655efc52145da79975a42ca982f91f3b6991bb9c4a6dd -EBUILD youtube-dl-99999999.ebuild 2008 BLAKE2B 0d73cc5f4c06fe047e9f6c111ee74928c77184ed1fb8f1378966d9e72466d9aaf6e24d9f1d0bced6700364e69ba89d68f053fc4bd10eb8800614561f6c26c1d0 SHA512 7ac9918237139f1dc59be95024ee76df8fa78b078c9f6182c5a290b70ef5672fa6df36b409e4d215e7a073df519d93ada3a4b90cff198ae5871202022648e9e6 +DIST youtube-dl-2019.04.30.tar.gz 3163152 BLAKE2B 9740bbbf883714f3c8017bca81b175a6179bb86b5226a284623a84afbd5c70d51010679c49eed3a3672fd7a147a5181b1a47d326c1fd4f403207dca7acf6a0c8 SHA512 db32d1162c11cd7850b162a48dd8f34bdfba142ab75fa3ac20088cf934cb9c6cfe44c0fc38bac173ae8056fe72aaae04e80b4ed47c162b1fdb1bdb2d95180ef6 +EBUILD youtube-dl-2019.04.30.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c +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.04.24.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.24.ebuild deleted file mode 100644 index 20bf8606772f..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2019.04.24.ebuild +++ /dev/null @@ -1,68 +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 "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.04.17.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.30.ebuild index 031b60d9dd80..4d80cb2b49ed 100644 --- a/net-misc/youtube-dl/youtube-dl-2019.04.17.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2019.04.30.ebuild @@ -60,6 +60,7 @@ pkg_postinst() { 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 diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild index 9adb986d3027..9bfa589db4fa 100644 --- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild +++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild @@ -60,6 +60,7 @@ pkg_postinst() { 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 |