diff options
Diffstat (limited to 'net-misc')
42 files changed, 926 insertions, 93 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex c9cf1b34ed92..c3a0f42590e5 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 8980d84c4c14..9cbc9594ca0e 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -34,10 +34,12 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706 DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0 +DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62 DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03 -DIST dhcp-4.4.0.tar.gz 11158069 BLAKE2B c554e15f549bdf6342bfa4337ab54f2a259a1c212700a69b56d795b1c91230759e254b050087ad09cf065d9dcc380e6110a95d63c3d2ba982c567dd381889d3e SHA512 0dcddfe803db0cea49204f71c9fbc3b1a55496acc83e344d9147893410bbb5f96874ff6457037ee9f759d701cea4bab98dc51ad5d7b23926254e25e5e421eabd +DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7 EBUILD dhcp-4.3.4.ebuild 7914 BLAKE2B f6f94a7af0aa70428d5fa6e51ab8ac79f25fc25f094694d0ab278398c52c6021d8efe5fa1e524751ba8eb3db214e97660146175ab6e2d91bbaa234a619266087 SHA512 434a6523ec0e3f56889c71be0ab919c4282f3843badc4c8a08aba6634175eabfa4b9921602dfce7147a44f5dc215060fe335b7bec1435364cafe159a6e23bc95 EBUILD dhcp-4.3.5.ebuild 7884 BLAKE2B 6ef306e4226389e05c904c74866918952ef16cf1caa2f4d23030aadcdbd259b8bbccb33df10daffce498fae9a189f1f8a6821a8746333d315bd2273c0cca6ed3 SHA512 d52d3ec0e9b046c29994af0af0cbd5bdc63cf040c7a4f8920d5f9f59d82223882df2cc6fa319d00a40d6b28b1938656587d9066942470fe0fdb812e732137a78 EBUILD dhcp-4.3.6-r1.ebuild 7823 BLAKE2B a28cef0d32954b13e1f6a963e419616c656f1c8cc97451db95d922a13a86eec908cef6858f9b6a080ad94c437211ef639fb016d4d52e040f5fdd9e5bd3868bab SHA512 f9e6247ba9ec67c5f8a93f8eae87dbfde8e9754bf621eb48d7641fb42d0ca6bffa66ae7d36bd984c168bab7293e3d73b7d119b96e1d0889181cf2c64b912d522 -EBUILD dhcp-4.4.0.ebuild 7916 BLAKE2B 044951da8562a5dba4bc8a4397f760855f8d76df9729155b887cbf0d579937aca9d77430b8a60b29d54ede015df5addbf4a3f8bdda57e1cc029df5a2e0f62118 SHA512 0ac149f90bdf8f408fb00fa14ddd357ef5fd2eb5b427f0e138dad0bc5229719dc4de620dec436a3d90f4d0706ffd72ecbb35dfc4cdbede19d020c68852042806 +EBUILD dhcp-4.3.6_p1.ebuild 7822 BLAKE2B 0d0f1873e46ea9e2f4969731dbf9f54008eb5936deeec23942ff5fe8f742ee8287217a955eb46e2a303d05dc122a37a3f2b373224038a102adfcefdad3c053cd SHA512 c3db449a9a7bddb842f2536d8975406ba353add42ee49df12bd39ba567a64c54c184a4e6dde0a810dd2c0a2b84ab10d8a40f8e9ece6440463c81eb2c52a6ace3 +EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B e0531baad9de9fa0ee437744ef35a7a747f29b8bfd490822b0c195423e7e57495e45bda40d59dbc16275b9723c43068d07c612e47c3e0753cf0952efcf9751fa SHA512 1952f93d33bb5e4c7f9c8bb7ebef4cbb1b279315435f8404405e824714c9c1ee1a469f7bd36732564f5b540a895539960e29b24160ef8acb729441835990f3f2 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild new file mode 100644 index 000000000000..55cb340ec65e --- /dev/null +++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd toolchain-funcs user + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="http://www.isc.org/products/DHCP" +SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" + +DEPEND=" + client? ( + kernel_linux? ( + ipv6? ( sys-apps/iproute2 ) + sys-apps/net-tools + ) + ) + ldap? ( + net-nds/openldap + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-dhcp ) + vim-syntax? ( app-vim/dhcpd-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind + unpack ./bind.tar.gz +} + +PATCHES=( + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + "${FILESDIR}/${PN}-3.0-fix-perms.patch" + + # Enable dhclient to equery NTP servers + "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" + + # Enable dhclient to get extra configuration from stdin + "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" + "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531 + "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921 + "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108 + "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636 + "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142 + "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832 + "${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598 +) + +src_prepare() { + default + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die + + # Change the hook script locations of the scripts + sed -i \ + -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ + -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ + client/scripts/* || die + + # No need for the linux script to force bash #158540 + sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die + + # Quiet the freebsd logger a little + sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die + + # Remove these options from the sample config + sed -i -r \ + -e "/(script|host-name|domain-name) /d" \ + client/dhclient.conf.example || die + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<client\>::' \ + Makefile.in || die + fi + + # Only install different man pages if we don't have en + if [[ " ${LINGUAS} " != *" en "* ]]; then + # Install Japanese man pages + if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then + einfo "Installing Japanese documention" + cp doc/ja_JP.eucJP/dhclient* client || die + cp doc/ja_JP.eucJP/dhcp* common || die + fi + fi + # Now remove the non-english docs so there are no errors later + rm -r doc/ja_JP.eucJP || die + + # make the bind build work + binddir="${S}/bind" + cd "${binddir}" || die + cat <<-EOF > bindvar.tmp + binddir=${binddir} + GMAKE=${MAKE:-gmake} + EOF + eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch + cd bind-*/ || die + eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717 +} + +src_configure() { + # bind defaults to stupid `/usr/bin/ar` + tc-export AR BUILD_CC + export ac_cv_path_AR=${AR} + + # this is tested for by the bind build system, and can cause trouble + # when cross-building; since dhcp itself doesn't make use of libcap, + # simply disable it. + export ac_cv_lib_cap_cap_set_proc=no + + # Use FHS sane paths ... some of these have configure options, + # but not all, so just do it all here. + local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" + cat <<-EOF >> includes/site.h + #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" + #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" + #define _PATH_DHCPD_DB "${l}/dhcpd.leases" + #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" + #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" + #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" + #define _PATH_DHCPD_PID "${r}/dhcpd.pid" + #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" + #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" + #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" + #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" + #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" + EOF + + local myeconfargs=( + --enable-paranoia + --enable-early-chroot + --sysconfdir=${e} + $(use_enable ipv6 dhcpv6) + $(use_with ldap) + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) + ) + econf "${myeconfargs[@]}" + + # configure local bind cruft. symtable option requires + # perl and we don't want to require that #383837. + cd bind/bind-*/ || die + eval econf \ + $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \ + --disable-symtable \ + --without-make-clean +} + +src_compile() { + # build local bind cruft first + emake -C bind/bind-*/lib/export install + # then build standard dhcp code + emake AR="$(tc-getAR)" +} + +src_install() { + default + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + docinto html + dodoc doc/References.html + + if [[ -e client/dhclient ]] ; then + # move the client to / + dodir /sbin + mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script + else + newexe "${S}"/client/scripts/freebsd dhclient-script + fi + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* + dosbin contrib/ldap/dhcpd-conf-to-ldap + fi + + newinitd "${FILESDIR}"/dhcpd.init5 dhcpd + newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 + newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 + + systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf + systemd_dounit "${FILESDIR}"/dhcpd4.service + systemd_dounit "${FILESDIR}"/dhcpd6.service + systemd_dounit "${FILESDIR}"/dhcrelay4.service + systemd_dounit "${FILESDIR}"/dhcrelay6.service + systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf + systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf + + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + fi + + # the default config files aren't terribly useful #384087 + local f + for f in "${ED}"/etc/dhcp/*.conf.example ; do + mv "${f}" "${f%.example}" || die + done + sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die +} + +pkg_preinst() { + enewgroup dhcp + enewuser dhcp -1 -1 /var/lib/dhcp dhcp + + # Keep the user files over the sample ones. The + # hashing is to ignore the crappy defaults #384087. + local f h + for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do + h=${f#*:} + f="/etc/dhcp/${f%:*}.conf" + if [ -e "${EROOT}"${f} ] ; then + case $(md5sum "${EROOT}"${f}) in + ${h}*) ;; + *) cp -p "${EROOT}"${f} "${ED}"${f};; + esac + fi + done +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then + ewarn + ewarn "WARNING: The dhcp init script has been renamed to dhcpd" + ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" + ewarn "and dhcp should be removed from the default runlevel" + ewarn + fi +} diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild index ca0eefb2fec1..358e3c1f12a2 100644 --- a/net-misc/dhcp/dhcp-4.4.0.ebuild +++ b/net-misc/dhcp/dhcp-4.4.1.ebuild @@ -168,6 +168,7 @@ src_configure() { # configure local bind cruft. symtable option requires # perl and we don't want to require that #383837. cd bind/bind-*/ || die + local el eval econf \ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ --disable-symtable \ diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest index 2176304fa969..0909677b446a 100644 --- a/net-misc/eventd/Manifest +++ b/net-misc/eventd/Manifest @@ -1,5 +1,5 @@ DIST eventd-0.21.0.tar.xz 392080 BLAKE2B 14d01d46e07e650f392abca53716c1fd5a5d70f05fe006e8a230d38be610e36ee0369742d258b46697376317be4ff6a071166a45528ef2840159a1024057d6cc SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae DIST eventd-0.23.0_p20171112.tgz 239548 BLAKE2B 690b25f04aec4796117178c0fced9b46aa3b223d8c7c91bdd5dc3623759448c5012985ab5b6de0d24db8e19071f8e66f4f9014f7e7111a65256ad29d593606bb SHA512 1a8409d1292a237db7bc7c10e70b4b1c34e5bd0c7bac1bf144e288dd69718c48041066d190b75ea73670db6031b296d0697b2e41136fbe20878975351c6e8bab EBUILD eventd-0.21.0.ebuild 2966 BLAKE2B e6d82d1078f3bb0e6fecca2ae8a7809cd0a71744eda832f59b2516adaebbc9b8b88bb5ae3b9b1f644540ca9b773c6d33d79fc0e8805a613cea1f2363dfcdcdad SHA512 c01234e76c5d57a059da82843a3cfd33c088723432e4964a23440c7ab5276755a7e159a23bf10a736e999e7c0566a8d87dd751b58b7112cf19b5abebe5e032a1 -EBUILD eventd-0.23.0_p20171112.ebuild 3169 BLAKE2B bf4106eb778d649f669ef184d03ebc4f3aa8a68cfc4fd0bcbd295329b689ef75e723b3198e5bf1e814847bba5c4bc85ac99265e914c6e83087d47d55c2545aa0 SHA512 47120a94b5e92c1434986873c544d4556a4be4fbf4b839be030ef0c9f185508ea1424e72cb3bc5864b2b147cbf0134c4d193f65d8ba741a65ce746bce7e1476d +EBUILD eventd-0.23.0_p20171112.ebuild 3194 BLAKE2B 47e4377b525b0a8276af932c5bc1cd3726be5f74bc6d8d3275d73a6c008c6542486e23a98aad8dcab2509400c18cba3539fbb2e9c8060093aa68f72beb9815ec SHA512 4de380eb22ba24d7b96c2be2e42e2029c06979822aa5998312b0b5fea2e7725f2aa41831b1f3b6c4505f3e16620f287f1e1b7c75d53a1617179237e537c5eebd MISC metadata.xml 1106 BLAKE2B 659cbf6ddc00f8b32c3d4f028f461579bce6388ea62198575863e596207d791a7048a01cd5d8be1b6b8bdbcaa281cd14f5c2c65566e9dfe716524d3075a75455 SHA512 24381bc7069e34eeeb10e3e5c967da13f155ca2a785d04f144f658c97f8734f16fc2f72fa57874b7da4495b24eced2d2607b0f3f8b52bc9d124da29a11c4f254 diff --git a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild b/net-misc/eventd/eventd-0.23.0_p20171112.ebuild index dc703ec3ad3b..94cc96e2e9c8 100644 --- a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild +++ b/net-misc/eventd/eventd-0.23.0_p20171112.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,6 +53,7 @@ COMMON_DEPEND=" zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} + >=dev-util/meson-0.44.1 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest index 8f68c9768ea3..bdce12a25080 100644 --- a/net-misc/gsutil/Manifest +++ b/net-misc/gsutil/Manifest @@ -3,6 +3,6 @@ AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836 AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57 DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a -EBUILD gsutil-4.27.ebuild 1740 BLAKE2B c3e503d3d77e86fd0b1348c8874e77d6dc98a13f4eb2800dac4af762fdfc46e1ccafe2ec18a90ab5977dbfd3fc4b77bea90c3b1ad6fd1cbaf8b626c80dd93dbf SHA512 bcdd47cd2b3a021b47e16a783e6ef805bdf89bddb08df894f0919972a801fa2a09eee724ca55ce15c316b7be371c643a17955eef4570701b4d4939bd41e20595 -EBUILD gsutil-4.28.ebuild 1744 BLAKE2B 94f21ca272815ef6dfb33670f4c9f62a3b3214b4028a6d017ddeea250aa08c77d1cdf443981fbbd52b1dfb3b66699e886ebad7b8161847c62ff35236f4db6c65 SHA512 5eb59880ae5a14af04c8714ef697795d62f0f831570729a8e7ee775f7355e3253dfb1d9f33617817e4d59e91c99839ef54737d869ebd84bde5bfe621dd017d17 +EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf +EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178 diff --git a/net-misc/gsutil/gsutil-4.27.ebuild b/net-misc/gsutil/gsutil-4.27.ebuild index 491ea929a00c..cb2c309ec5f9 100644 --- a/net-misc/gsutil/gsutil-4.27.ebuild +++ b/net-misc/gsutil/gsutil-4.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -27,6 +27,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}] >=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}] =dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] >=dev-python/python-gflags-2.0[${PYTHON_USEDEP}] >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] diff --git a/net-misc/gsutil/gsutil-4.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild index 452ebb5e0681..85dfba63c0dc 100644 --- a/net-misc/gsutil/gsutil-4.28.ebuild +++ b/net-misc/gsutil/gsutil-4.28.ebuild @@ -27,6 +27,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}] >=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}] =dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] >=dev-python/python-gflags-2.0[${PYTHON_USEDEP}] >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest index e899fd5451fc..2721fe49819a 100644 --- a/net-misc/lksctp-tools/Manifest +++ b/net-misc/lksctp-tools/Manifest @@ -5,5 +5,5 @@ DIST lksctp-tools-1.0.16.tar.gz 565446 BLAKE2B 2eff562809f24b76b8f129698c8fef30f DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 EBUILD lksctp-tools-1.0.13.ebuild 1325 BLAKE2B 2abb94d04bc857ce825ac73d11aa3eb0edf212f2665734e154196ffe7a420dbf50aac450de9b50710df6fadcb56e1b59a7f0f0c7e21fd41746e3be892908d35d SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586 EBUILD lksctp-tools-1.0.16.ebuild 1262 BLAKE2B 5a1d23239b5a9db76cad9c1cb9004d70ac5bf0cdb7c5bfc6f40fae6a369668bda47943020d3412277540d73cc9cabf30eb4cad7eca2908070b05d7ee423a01ff SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f -EBUILD lksctp-tools-1.0.17.ebuild 1266 BLAKE2B 7274f852be0ab039aeb00958e4c5bd90a6e98d87d9642952503098461b48970414831cc67e734694469997762581d71be7ff4fe9f4e5e93181aec77a0f1648af SHA512 251b05b9a659090f746bbc969165f0d357261fdd6a7ef1bd6b56beda531e6d7ffbc3b74e1bcfa1ccea72cdf04864341935bf4a8926f4312c8a57ae3c82b6584c +EBUILD lksctp-tools-1.0.17.ebuild 1265 BLAKE2B 6a3c73ed3eb77d1b9371427c3e23ba9be45c07d4429bd08a980db5e71811d3d96d17744e593f11e5ee461002414285149deb0fcc48cf5bf74aec619ffff828ce SHA512 342b8826bde54dd765ce31dfb1d3943f17344d0c9aad768d82fadeedac5aac1411326be5962cbc44c2340113e005073efcc43c9b6d97f72b21d10965951c2bd0 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild index 44837d3974fe..6f608c2c2173 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz" LICENSE="|| ( GPL-2+ LGPL-2.1 )" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" IUSE="kernel_linux static-libs" # This is only supposed to work with Linux to begin with. diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 5cf5d42df78a..8f36d9c7c963 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -9,8 +9,10 @@ DIST memcached-1.4.33.tar.gz 389813 BLAKE2B 1dbee338c0cb3c9006c71e60353328dbabb8 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214e68ddfbd79afc9b71543227ee08279b5a7d1beb5da5f9b4f5ae6c9670979eba6259eb299510b80abcbfa29e362f SHA512 38883600398b5d9378bb57508ed94b80ed2c4ef0e2610e328a60bcb79268f85c67c99159993040b36eac964138822862fa78f62c649560abc4818233b1b2f3d0 +DIST memcached-1.5.6.tar.gz 452038 BLAKE2B 357197c06a3211a7f2fcd90a3895f0ed3a56bc4e5b685e2dbe605cd9bbab676759b9707c9cedaeec9dbc59dddca92a7e6152cf5f4324ec66edbf7425bd7a7209 SHA512 b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4 EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568 EBUILD memcached-1.4.39.ebuild 2874 BLAKE2B b60878901f27e675361fbd99cce16cb29961ee5ae7a741bd94dd63fe5328d9787f8f48f1f509c7eac763969725bdd28a59ab7e220931c5a779c78edb7275647f SHA512 8bad575b3917d919ede30eaf5e19e45cf8ac717a104fe3789716fbd308c813be685175dc103d24ceeb46252ee51d3280250173bb2711daff7275454d19633502 EBUILD memcached-1.5.2.ebuild 2883 BLAKE2B e2af9f55c4ccba675ec3abdd5312134d37f353a009ba2d99cc4ce6aad2d6e6bc16161f9a2e1610a8455074ba95b4864c06b1d77cb8edcfb27ced7d8f379afdd2 SHA512 08a70dd85f3748fc7c1c1d30a80388b104096f17932026604fc7d00d6f8b22c0d3db32948f25db65159f7ba3c57c0de722114e492561b401e8095c987defa39f EBUILD memcached-1.5.5.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2 +EBUILD memcached-1.5.6.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.5.6.ebuild b/net-misc/memcached/memcached-1.5.6.ebuild new file mode 100644 index 000000000000..7b92758285f1 --- /dev/null +++ b/net-misc/memcached/memcached-1.5.6.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 0a59db551013..998006718c98 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -2,6 +2,8 @@ AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771 DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2 DIST miniupnpd-2.0.20180203.tar.gz 223084 BLAKE2B 14d7b1f8136be5e211ee2e5374b8ee77dfeb3e64e1308f918d9334a8600234e38581caa293b613cd3736d4a8cfc196a54839cffa8091a36961f4e0e79c727455 SHA512 ef02e33cd93225992c193a13be2320de02255610532de77cf704573384c777d82a4cb89c295982bb660ce056e38ef341223ab362bab74b2cb6954ed4e62b0219 +DIST miniupnpd-2.0.20180222.tar.gz 223697 BLAKE2B f551c9219a3a0a0eda905c953c5f9f45df3f192d3d253111cb35ce51351561ae2547351cb901b91eafc1765bd89b75760063e109bacfae625ff8090563913883 SHA512 a7ee306ccac0673e55780129b3c61de025ec63a653383ae475f08695a95647ae83e5e5978ce6ee166e8d0270a5bd08250613593acaabd0b730178ca2e52dc482 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899 +EBUILD miniupnpd-2.0.20180222.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899 MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild new file mode 100644 index 000000000000..9f786c4d43a2 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 +} + +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/ntp/Manifest b/net-misc/ntp/Manifest index ce3b371333cc..a6decc0bc65f 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -19,5 +19,8 @@ AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f652 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 DIST ntp-4.2.8p10-manpages.tar.xz 25004 BLAKE2B 8bb830dddc9b664cb974cb9ef887a6c1913e9695b0519e21cd0db0af71c08dd6cf90ce35904ad38605ee0bf90115f1e8e3fcdd6c624806c3448fbc47ba7eb697 SHA512 5b31a1429484ad30a35c8fa38157190a66b0983b5bf1a802c0817613901b5e0644941a3f4d5b660fcfe4ca04968766a5981331a6f9353316e7de953e55c33a09 DIST ntp-4.2.8p10.tar.gz 6998648 BLAKE2B 93875ddb71fda1a24bcde0358640eb0cdab7aa0020219e7d3f7632cad15c962012c871e04cae5b81156aa30b60f55e9d02ef4c402a921587b980d24fb1134ca4 SHA512 67e01ab533c3dfabb0bdd3ced848bdd239980bde28fdb2791d167b7e9690ab3b3759e1bd99e9fddcce03ddef4cd63a47eb85941bb127ceb79b7ecff22cce9c05 -EBUILD ntp-4.2.8_p10-r1.ebuild 4497 BLAKE2B b5f75868d8b701db7a11b5ff228cc820e614a3e8def312645ab1585fa93163ade7efae74fbbe86137b0e9e9d7d2217c0c3894a0d6624c48f585fbfe9e8d14574 SHA512 db0818229c52746360083923962ecbb649d5eefa0ba21e52daf27186b5e6e435a9cc510df01416376e159a6edae67880bce4c43f17329d773e4a395908f0f83d +DIST ntp-4.2.8p11-manpages.tar.xz 25700 BLAKE2B 8efff006297925e4dfe57abfb8130d0dcb69e804744a597ad92b9969019b87c7b3e44f032187073d3c19092ca92445ce06b93f89f449430fd21cc540f11f5f3b SHA512 403bc238681abaadc838f5a6619851dcd0cfa5bf780e8aeaa94e8f77e776998d1f5142d65e3fa99c23e22e4cb7207d24b059fbbc6ddcf4414f0076a4b6ab4e81 +DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c71499872272cda221d7356676762a23ac1066ddfed7fb803083dbb9b26ca7376ea75277a63ee8de1c70409e81432 SHA512 05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236 +EBUILD ntp-4.2.8_p10-r1.ebuild 4516 BLAKE2B 6d60f5c47e7d82630b7e10dee95b13e8f7ba0b783422bc74737231ec662a6b1c87062ff0aa91268dd549fa52dde612342683ba0df5c424d8b8599bde0e9c052e SHA512 fccc0def7b97a42a62d798b75ffbfede6f58a5ed9ae8f1f8d7af58e49cb11da49cf245366f955171abdb6e797f6afc6737f27dbb88c08667e9b1e6ac4d123e5f +EBUILD ntp-4.2.8_p11.ebuild 4527 BLAKE2B aab6adb14c39d2cf5ded64e8c2e9f03b4db5c9152d829f4ef4ee515027067ae85700ded1ee605d5c57208ae56b7a415bdb623c1b2066d69b58addb28845ca35b SHA512 ea5bfe4085840ff9046a3aac100f9bafb7a4fb4f2a26684545e5a62a5341a1d6a63d7d51c71c5f108f11a9642e9aa14932e038e662a61b8543e063799eb6c7a3 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 diff --git a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild index af336404a175..c93639d4c25e 100644 --- a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild @@ -20,7 +20,6 @@ CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) @@ -31,7 +30,10 @@ DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" PDEPEND="openntpd? ( net-misc/openntpd )" S=${WORKDIR}/${MY_P} diff --git a/net-misc/ntp/ntp-4.2.8_p11.ebuild b/net-misc/ntp/ntp-4.2.8_p11.ebuild new file mode 100644 index 000000000000..179de05fc600 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p11.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools toolchain-funcs flag-o-matic user systemd + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="http://www.ntp.org/" +SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz + https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) + >=dev-libs/libevent-2.0.9:=[threads?] + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + parse-clocks? ( net-misc/pps-tools )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch +) + +pkg_setup() { + enewgroup ntp 123 + enewuser ntp 123 -1 /dev/null ntp +} + +src_prepare() { + default + append-cppflags -D_GNU_SOURCE #264109 + # Make sure every build uses the same install layout. #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + eautoreconf #622754 + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck +} + +src_configure() { + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Increase the default memlimit from 32MiB to 128MiB. #533232 + local myeconfargs=( + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + --docdir='$(datarootdir)'/doc/${PF} + --htmldir='$(docdir)/html' + --with-memlock=256 + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable ipv6) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + # move ntpd/ntpdate to sbin #66671 + dodir /usr/sbin + mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + doman "${WORKDIR}"/man/*.[58] + + insinto /etc + doins "${FILESDIR}"/ntp.conf + use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726 + newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die + + keepdir /var/lib/ntp + use prefix || fowners ntp:ntp /var/lib/ntp + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm -r var/lib || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/*/ntpd.8 || die + else + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D%/}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index cee38e4e9cab..cea9697d4e96 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,6 +1,9 @@ -AUX ntpd.confd 222 BLAKE2B 4884ac23276fffd1c5043ed70b655b2429fcff08a24e6b9912a378fe0493e29ef3e59b11e1ec5cda2302cfba843f0fa5cf22b4499576b5e360f547122a2a194c SHA512 6513e4dce6700f437b98c0592277c336da07e72a251a8f1183d066f7dd5e0ca36c3ddf83f3102965217f70f1f26769650f5d7d3a034590e4dc9cf9f84d98b6cf -AUX ntpd.rc-r1 495 BLAKE2B b6ea30209128135f69314e7b8009f349bfc7c0811d22cba7d1d14bcdb331799cefe330d230551cef51ccbfddf6a9fb9cae385f81853ad072a263d090b82bcd59 SHA512 0519214247a978c79f1c73262f7963eaf688466b0471d5414886f6a4b40379520491a8d818a1d8eb728724c4aae9822452d71e7bd1223d4c0af5130274d7f87a +AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba4037308ac1e3c83fc49700c1c0d6ee2e3f274dcb76bc13bfaeefdc9cd533a56cef9454ee27eb SHA512 5b55618b870e436b2160e46ede5e1b8031dab368d72bf376a6a9664f1cb528ae37e10eedeb7d438fee8155e3c50139ac240af95a14215aebbfef3133f3b68694 +AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542 +AUX ntpd.rc-r2 491 BLAKE2B b6f035bbdf9a9cc67d9fbee1752fa98e81bdc0d46f58fc20650513e41e7372319f7c8592ba73cafdaacb72fd3ebefcf1e524cf0e44348174104c9d88751816fd SHA512 215c8b37814de267834d6656146bf871f0e0da66cbd472d43d9b304ce73326bdfc4ba6624545988a8d7ca09e8a52e183c89081bdb690137a7e6d174aff97a42a AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9 +AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb35b3b8ca2bb6dda6a75a84cfcce04777a0e9ff48a6f3bbd82dfc9fd47977aba749dd93200e81280cea5475bc04c933f3 SHA512 12eaa510d6dac6b6e2fe764d6ec8cc8582031be25e5e6785a4813d4c150ecb36574b64f1fa8c2a7d6cf6a49423642fe875774b8d6e894f31f8605e5716313107 DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43 -EBUILD ntpsec-1.0.0-r1.ebuild 3097 BLAKE2B 35da6f84d8f85a10dd27f95015bc07163b09d84081b6c41aaf77dde48e8c4d3db6b35de30c61fadc83be7f5189d3194fd64dce0059935952613bcae0af2eebd8 SHA512 8d5278b918298c957b0567afb291dc523893de5bb06568ff7fef6c34ef628cb47e7c93251bd05a97daa957aa38a35f6ec885ce396a7f06498a2b4427da807cb6 +EBUILD ntpsec-1.0.0-r6.ebuild 3984 BLAKE2B d1752c19aedecd7cb4a7522ab4f4adbc6c86daf0a3d33a45aa81f501142b0daab5e66785362f751d3603f21fdab66c17a22304365db99af5dd808ae6beccc95a SHA512 fecd7e354283d83be97445a4d7dd36e103f56e123519bbfacfd2983d8e94953dcafc461d97a628be7b019e06a989ef1778afa1af63a41d2e42b61023debc92a9 +EBUILD ntpsec-9999.ebuild 3899 BLAKE2B 2b7cd2154ca66134947d435ce1315402b9eeca0bad2400a318c1ae52a0a155089eddc2787906127eed5a33a644d25ee972abbea597e206f18364774f3ee458eb SHA512 294b7491be69d17d96d01664e26813913cf7ca0c0d18c58a81c2dd9268de625b5681097bdc4f1612e242260aa8b5c555023b2cb02f5d51267644a885de0b8da4 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16 diff --git a/net-misc/ntpsec/files/ntp.conf b/net-misc/ntpsec/files/ntp.conf new file mode 100644 index 000000000000..e8d68d2ba9bf --- /dev/null +++ b/net-misc/ntpsec/files/ntp.conf @@ -0,0 +1,21 @@ +# This is a Gentoo specific configuration file so ntpsec +# works out of the box as a client. Upstream configuration +# can be found in /etc/ntp.d/, but these are not used by +# this file. They are provided as a guide to more complex +# configurations. For more information on how to configure +# ntpsec see https://docs.ntpsec.org/latest/ + +# Pools for Gentoo users +pool 0.gentoo.pool.ntp.org +pool 1.gentoo.pool.ntp.org +pool 2.gentoo.pool.ntp.org +pool 3.gentoo.pool.ntp.org + +# These are the restrictions most people want +restrict default kod limited nomodify nopeer noquery +restrict -6 default kod limited nomodify nopeer noquery +restrict 127.0.0.1 +restrict -6 ::1 + +# Don't change this location. +driftfile /var/lib/ntp/ntp.drift diff --git a/net-misc/ntpsec/files/ntpd.confd b/net-misc/ntpsec/files/ntpd.confd index 92c553a62615..50c1aac60665 100644 --- a/net-misc/ntpsec/files/ntpd.confd +++ b/net-misc/ntpsec/files/ntpd.confd @@ -1,7 +1,4 @@ # /etc/conf.d/ntpd -# Options to pass to the ntpd process -# Most people should leave this line alone ... -# however, if you know what you're doing, feel free to tweak -#NTPD_OPTS="-g -n -u ntp:ntp" +# Most people should leave this line alone. NTPD_OPTS="-g -u ntp:ntp" diff --git a/net-misc/ntpsec/files/ntpd.rc-r1 b/net-misc/ntpsec/files/ntpd.rc-r2 index dbe76c85e536..13fcbdd092d2 100644 --- a/net-misc/ntpsec/files/ntpd.rc-r1 +++ b/net-misc/ntpsec/files/ntpd.rc-r2 @@ -4,7 +4,7 @@ # $Id$ description="ntpd - the network time protocol daemon" -pidfile="/var/run/ntpd.pid" +pidfile="/run/ntpd.pid" command="/usr/sbin/ntpd" command_args="-p ${pidfile} ${NTPD_OPTS}" start_stop_daemon_args="--pidfile ${pidfile}" diff --git a/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch b/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch new file mode 100644 index 000000000000..b9716569f631 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.0.0-fix-seccomp.patch @@ -0,0 +1,16 @@ +This is a backport of https://gitlab.com/NTPsec/ntpsec/commit/eef92d6217da03ad2ae41e298d110bdb05031381 + +diff -Naur ntpsec-1.0.0.orig/ntpd/ntp_sandbox.c ntpsec-1.0.0/ntpd/ntp_sandbox.c +--- ntpsec-1.0.0.orig/ntpd/ntp_sandbox.c 2017-10-09 23:54:39.000000000 -0400 ++++ ntpsec-1.0.0/ntpd/ntp_sandbox.c 2018-02-28 07:31:28.381406881 -0500 +@@ -354,6 +354,10 @@ + SCMP_SYS(write), + SCMP_SYS(unlink), + ++#ifdef ENABLE_EARLY_DROPROOT ++ SCMP_SYS(getdents), ++#endif ++ + #ifdef ENABLE_DNS_LOOKUP + /* Don't comment out this block for testing. + * pthread_create blocks signals so it will crash diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild new file mode 100644 index 000000000000..890ec4f7ebf4 --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE='threads(+)' + +inherit flag-o-matic python-r1 waf-utils systemd user + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" + BDEPEND="" + KEYWORDS="" +else + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" + RESTRICT="mirror" + BDEPEND="" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="The NTP reference implementation, refactored" +HOMEPAGE="https://www.ntpsec.org/" + +NTPSEC_REFCLOCK=( + oncore trimble truetime gpsd jjy generic spectracom + shm pps hpgps zyfer arbiter nmea neoclock modem + local) + +IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} + +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# net-misc/pps-tools oncore,pps +CDEPEND="${PYTHON_DEPS} + ${BDEPEND} + sys-libs/libcap + dev-python/psutil[${PYTHON_USEDEP}] + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND="${CDEPEND} + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + !net-misc/ntp + !net-misc/openntpd +" +DEPEND="${CDEPEND} + app-text/asciidoc + app-text/docbook-xsl-stylesheets + sys-devel/bison + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) +" + +WAF_BINARY="${S}/waf" + +pkg_setup() { + enewgroup ntp 123 + enewuser ntp 123 -1 /dev/null ntp +} + +src_prepare() { + default + + # See https://gitlab.com/NTPsec/ntpsec/issues/460 + eapply "${FILESDIR}"/${P}-fix-seccomp.patch + + python_copy_sources +} + +src_configure() { + is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + + local string_127="" + local rclocks=""; + local CLOCKSTRING="" + + for refclock in ${NTPSEC_REFCLOCK[@]} ; do + if use rclock_${refclock} ; then + string_127+="$refclock," + fi + done + CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" + + # Remove autostripping of binaries + sed -i -e '/Strip binaries/d' wscript + + local myconf=( + --nopyc + --nopyo + --refclock="${CLOCKSTRING}" + $(use doc && echo "--enable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(use nist && echo "--enable-lockclock") + $(use samba && echo "--enable-mssntp") + $(use seccomp && echo "--enable-seccomp") + $(use smear && echo "--enable-leap-smear") + $(use tests && echo "--alltests") + $(use_enable debug debug) ) + + python_configure() { + waf-utils_src_configure "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure +} + +src_compile() { + unset MAKEOPTS + python_compile() { + waf-utils_src_compile + } + python_foreach_impl run_in_build_dir python_compile +} + +src_install() { + python_install() { + waf-utils_src_install + } + python_foreach_impl run_in_build_dir python_install + + # Install heat generating scripts + use heat && dosbin "${S}"/contrib/ntpheat{,usb} + + # Install the openrc files + newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newconfd "${FILESDIR}"/ntpd.confd ntp + + # Install the systemd unit file + systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service + + # Prepare a directory for the ntp.drift file + mkdir -pv "${ED}"/var/lib/ntp + chown ntp:ntp "${ED}"/var/lib/ntp + chmod 770 "${ED}"/var/lib/ntp + + # Install a log rotate script + mkdir -pv "${ED}"/etc/logrotate.d + cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd + + # Install the configuration file and sample configuration + cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf + cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ +} + +pkg_postinst() { + einfo "If you want to serve time on your local network, then" + einfo "you should disable all the ref_clocks unless you have" + einfo "one and can get stable time from it. Feel free to try" + einfo "it but PPS probably won't work unless you have a UART" + einfo "GPS that actually provides PPS messages." +} diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 91a7ea1e911c..a4689a76e05b 100644 --- a/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -3,10 +3,10 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) PYTHON_REQ_USE='threads(+)' -inherit flag-o-matic python-any-r1 waf-utils systemd user +inherit flag-o-matic python-r1 waf-utils systemd user if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -39,13 +39,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" CDEPEND="${PYTHON_DEPS} ${BDEPEND} sys-libs/libcap - dev-python/psutil + dev-python/psutil[${PYTHON_USEDEP}] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) " RDEPEND="${CDEPEND} ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + !net-misc/ntp + !net-misc/openntpd " DEPEND="${CDEPEND} app-text/asciidoc @@ -53,16 +55,20 @@ DEPEND="${CDEPEND} sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) - !net-misc/ntp - !net-misc/openntpd " +WAF_BINARY="${S}/waf" + pkg_setup() { - python-any-r1_pkg_setup enewgroup ntp 123 enewuser ntp 123 -1 /dev/null ntp } +src_prepare() { + default + python_copy_sources +} + src_configure() { is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin @@ -80,37 +86,69 @@ src_configure() { # Remove autostripping of binaries sed -i -e '/Strip binaries/d' wscript - waf-utils_src_configure --nopyc --nopyo --refclock="${CLOCKSTRING}" \ - $(use doc && echo "--enable-doc") \ - $(use early && echo "--enable-early-droproot") \ - $(use gdb && echo "--enable-debug-gdb") \ - $(use nist && echo "--enable-lockclock") \ - $(use samba && echo "--enable-mssntp") \ - $(use seccomp && echo "--enable-seccomp") \ - $(use smear && echo "--enable-leap-smear") \ - $(use tests && echo "--alltests") \ - $(use_enable debug debug) + local myconf=( + --nopyc + --nopyo + --refclock="${CLOCKSTRING}" + $(use doc && echo "--enable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(use nist && echo "--enable-lockclock") + $(use samba && echo "--enable-mssntp") + $(use seccomp && echo "--enable-seccomp") + $(use smear && echo "--enable-leap-smear") + $(use tests && echo "--alltests") + $(use debug && echo "--enable-debug") + ) + + python_configure() { + waf-utils_src_configure "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure +} + +src_compile() { + unset MAKEOPTS + python_compile() { + waf-utils_src_compile + } + python_foreach_impl run_in_build_dir python_compile } src_install() { - waf-utils_src_install + python_install() { + waf-utils_src_install + } + python_foreach_impl run_in_build_dir python_install # Install heat generating scripts - use heat && dosbin "${S}/contrib/ntpheat"{,usb} + use heat && dosbin "${S}"/contrib/ntpheat{,usb} # Install the openrc files - newinitd "${FILESDIR}/ntpd.rc-r1" "ntp" - newconfd "${FILESDIR}/ntpd.confd" "ntp" + newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file - systemd_newunit "${FILESDIR}/ntpd.service" ntpd.service + systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service + + # Prepare a directory for the ntp.drift file + mkdir -pv "${ED}"/var/lib/ntp + chown ntp:ntp "${ED}"/var/lib/ntp + chmod 770 "${ED}"/var/lib/ntp # Install a log rotate script - mkdir -pv "${ED}/etc/"logrotate.d - cp -v "${S}/etc/logrotate-config.ntpd" "${ED}/etc/logrotate.d/ntpd" + mkdir -pv "${ED}"/etc/logrotate.d + cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd + + # Install the configuration file and sample configuration + cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf + cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ +} - # Install the configuration files - cp -Rv "${S}/etc/ntp.d/" "${ED}/etc/" - mv -v "${ED}/etc/ntp.d/default.conf" "${ED}/etc/ntp.conf" - sed "s|includefile |includefile ntp.d/|" -i "${ED}/etc/ntp.conf" +pkg_postinst() { + einfo "If you want to serve time on your local network, then" + einfo "you should disable all the ref_clocks unless you have" + einfo "one and can get stable time from it. Feel free to try" + einfo "it but PPS probably won't work unless you have a UART" + einfo "GPS that actually provides PPS messages." } diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index cd2257cf7061..5f1980ee37bc 100644 --- a/net-misc/quagga/Manifest +++ b/net-misc/quagga/Manifest @@ -18,5 +18,5 @@ DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd EBUILD quagga-1.2.2-r1.ebuild 3753 BLAKE2B 460befe5cbd2ad7cda462bfcf47ce10064d4b930c458b0076e00ad7b2ca2f03dcd8c9245ba65b4d75437498d841c1ccd3987cf61db61205fcfa2f20aab21a50b SHA512 2b64bc0363275d7ab6da6dd1e9fdddc819a2fe6bce5a2878157ef82a38c78ff388e11cf6c683de336dc121ee04ed5ffbc81c59f251c8ac78faca3fbe5de3b75c EBUILD quagga-1.2.2.ebuild 3675 BLAKE2B 29d8900e617dd1a682dc592aa167a6d917484b21a264cd2d5a1e463a4b67fbaf7d00b843602e851b02a471a395176819a9c98efd95fd6cbec80b62d305fe9982 SHA512 ad383a681c9e0f1e196d26d34c6d1825d264d7b80f901688c3b081f40b993eafbc618eb94a43f118bfecf8361dfab018136a831162d8aebe8350d397b24ab6d1 -EBUILD quagga-1.2.4.ebuild 3678 BLAKE2B f7d3984970976d1878d59def3fdf77b28ff3369730f10c44a13edf70a4aa0c81dca32e80ebeaadea7fab2e99b1bc1e041a097d7a479524eb80beae318c9ed438 SHA512 f316d74f62c6eb9b037a1fd19cb13e781f5b81726169ebb7c856a9a5af69b090e609e47c24603c86c0ef106c5060b8f3a8678cbb5de3f1e2bc83014479f19aa9 +EBUILD quagga-1.2.4.ebuild 3677 BLAKE2B 93dc3cd4565b29f1a7857ff1469acf46f624d0305a1128240f1f757056bf7d0f8a865f7ac873e21cefd45d096a81f144830cef518565ca0292864787a38a8d63 SHA512 090f5553aea4d0475ce2fc862c6738488423c38506ac45e323c015292635b899d8b1aa320aca1f575ca07184225d23822d679ec46f19cd5731df682a95bb790b MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild index f3cf905e3fc3..550025ce130e 100644 --- a/net-misc/quagga/quagga-1.2.4.ebuild +++ b/net-misc/quagga/quagga-1.2.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~s390 sparc x86" IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test" diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 4515c6d72a12..b39fa7560604 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -12,5 +12,5 @@ AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aab DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 EBUILD rsync-3.1.2-r2.ebuild 3067 BLAKE2B 6d7a98dd131f732aabf23725b90a0c4d9ca63bdfb94894c0764d249444331bd2c2aed6e07190ce8d844b6ebb60e32b38a4cd728f63539af80d05458f065ae77a SHA512 c1b0b9035e003d9c5648f5f265231fec047bda7f709d1e82172b6537eec10e8c2f0c0d73471d4d81f7a51339988ed4a3ebf4c7afc42106b5db17545f05162ce7 -EBUILD rsync-3.1.3.ebuild 2828 BLAKE2B dece1237d99823ad44c2deadb40cf71b49f0f5c5cd63d8f6251e244b97697b2b11fb24e157b030bd55df2efd1c3fd2e9444cd49fb075ab05fce404b74295ad49 SHA512 3fcebd95af39e2cb2c5f233a1ac3309bae88677268c51a42d4309e017c7a566080c7eeab2c8877f28d16ba2bf8f6e5ccecbce3e8600aff8661d249c4cefd9db5 +EBUILD rsync-3.1.3.ebuild 2827 BLAKE2B f1b1a71d49b43e8c0acf70f99ed32580edd32ed0cdd37b0198eb543b7cb57f00f7d2ac40bfe8e50822642aa4ceb458bbbb0daf4042206a8676ab8b52c61a0d2b SHA512 734b6ce5428085ebe113aa8896ee13544f657ba2b77d467b460f9d507d8dacf85c7f369ada4ef9e519b77b39d47623f346c56a065b4b95e0d5f0393189dd8ed0 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 43f1f6aa651c..a547e3fdfb2d 100644 --- a/net-misc/rsync/rsync-3.1.3.ebuild +++ b/net-misc/rsync/rsync-3.1.3.ebuild @@ -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 ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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/scponly/Manifest b/net-misc/scponly/Manifest index a1560f25bc5c..cf660fc0b2b0 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -1,5 +1,5 @@ AUX scponly-4.8-gcc4.4.0.patch 571 BLAKE2B 8934806f75ebf80afabe11bb5d63ce1d1716fdba12c7dd31875c0ac0d5664fe254e80d4d4880b0c875487600ff8825104517df9f16a1b7d07a66e5ebf7d80268 SHA512 2e215ab2c39bb0550345725d3d509354be88144000072e5e14eda9f0ecb1bcc4c418e76d9db85ef6d6568962efc4472fe28d855e15adfe2bc5ba78c69d293a12 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b -EBUILD scponly-4.8-r5.ebuild 6849 BLAKE2B df3a30ba1918c9e05c60c849fd0923935281125a78bdf5c350e1c167d0f9713eb5b90af111585588471bdfee312a99e2a100e6ffd100109ac89dd91444170002 SHA512 a055d2699afa7a7d55a022a748ceb661beeaa5ccf59a9ad99d0a429930da3ac3fea9c7d87f131f76d69cf591fe189b50b25d8b42a9c2bcc73cfe2220d6dd1aaa +EBUILD scponly-4.8-r5.ebuild 6848 BLAKE2B 743b3fd102a128968d4bf9aee0575fd8b36bc93b5e942a2145dfa72fdd464ac75b26b297daf6a307d51988cc25338f0b56fdeb8a6dc46f1f6b10fb50377a287b SHA512 da4fd7c60c5b268823f9d5083b8578ae22d3678963f44cbc2ad0420522f5a28843b78f21d39e1decca4d9b462a0f426cb74cb349055515f3e81970f21274e266 MISC metadata.xml 1443 BLAKE2B 2a5a24d22c30cfafe590841b6d6e4eb73d9c42dddc469e617c79585eaa05a3a7b1bf31b6cc6fc0f7b1c521610d969e6c40d197af08e3dcce37b7ce65f67d259b SHA512 b44a26ac0944e8b0b99bfd62a21684b9846a52e416a2874a1af9bbcdf270ff337dd26a55a24c6b4dd131ba51ef3b7b40e1375478a14049392782a5adbb1fed07 diff --git a/net-misc/scponly/scponly-4.8-r5.ebuild b/net-misc/scponly/scponly-4.8-r5.ebuild index 8a119ed2a587..2e53a29f0870 100644 --- a/net-misc/scponly/scponly-4.8-r5.ebuild +++ b/net-misc/scponly/scponly-4.8-r5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit eutils multilib readme.gentoo toolchain-funcs user DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" -HOMEPAGE="http://www.sublimation.org/scponly/" +HOMEPAGE="https://github.com/scponly/scponly" SRC_URI="mirror://sourceforge/scponly/${P}.tgz" LICENSE="BSD-2" diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest index df8f42ad9325..209182614022 100644 --- a/net-misc/tn5250/Manifest +++ b/net-misc/tn5250/Manifest @@ -1,6 +1,8 @@ -AUX disable-sslv2-and-sslv3.patch 2333 BLAKE2B f0debeacfcfe2596b716733cd80195b402f9b1536b3bbc6be7d12b763a2724b84c7030e92d76cdeca2685fb1bfc1714ab8d545276d23460f6cff930db412e86d SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd -AUX fix-Wformat-security-warnings.patch 2283 BLAKE2B 59ffb231abf6ef7927d79e8be51133c6f1f31f63ec38514bbaeee2069c3d063dc7ef3642953b7777668c016bb30e06c590ed63bb618d7796c3475483d77708b1 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04 +AUX tn5250-0.17.4-disable-sslv2-and-sslv3.patch 2333 BLAKE2B f0debeacfcfe2596b716733cd80195b402f9b1536b3bbc6be7d12b763a2724b84c7030e92d76cdeca2685fb1bfc1714ab8d545276d23460f6cff930db412e86d SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd +AUX tn5250-0.17.4-fix-Wformat-security-warnings.patch 2283 BLAKE2B 59ffb231abf6ef7927d79e8be51133c6f1f31f63ec38514bbaeee2069c3d063dc7ef3642953b7777668c016bb30e06c590ed63bb618d7796c3475483d77708b1 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04 +AUX tn5250-0.17.4-tinfo.patch 294 BLAKE2B 6032318a041b7e495e709f44e6abeedaee17be5754f779d73b33cfd0bc9fd625c53687cc9e2e0f49dc8be48ea497f3d2f3d9cba0b48c59d3f84fd9a98bdeab50 SHA512 e348a54d74e79fd3b7d4a7ae8a8bbab9751f873317b82738c1b934c643a4fe28cefb38008d944af61fe64f0852a1bb5eeea7b6bb8143e51a3469bc20fb8e0b22 +AUX tn5250-0.17.4-whoami.patch 450 BLAKE2B 529c2822328ae5b7eb70e49e1459271d325f465c6ecc3c2f0621805e1f61892c58614cdcd84c522ffe7b78d05c554af9928ff181497fefc13fb82a62c916502b SHA512 404fd5913db7240f1db14ac2a45e2897866e50fc33d56e5eb22e810b238d47b5d6c3700dd73fe095c2f5714e5f8f745c7e0bf670450d6454d20f10fa2f8c69c2 DIST tn5250-0.17.4.tar.gz 648452 BLAKE2B 9e4d2d2b3148d063eecfc57f32daa1936d9f829a219952c9eb666e3f128c42f5ac611c4ccf12cdd533b3758459ce7f2f4e7c8fe74090042cb796067a7f6afe14 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804 EBUILD tn5250-0.17.4-r1.ebuild 1247 BLAKE2B 6169023b231922ef82594a6359d2d3f824cec17d1def604fca3a1aa676f3b6939a89cf882fa2e21afab20c7a6e6f46d00df9953c6e342af9016974a3e50802dd SHA512 e57461bf744d4ffffad3c8046a9faf674d0cef81d6baf1ea88546d5155a1eef7668931955599ab64a4ff4566990591edb41aba55a45f5ccb54dccfac7319e722 -EBUILD tn5250-0.17.4-r2.ebuild 1322 BLAKE2B ff004ff4df419e7dd5f1887bd758e4ced8c563735330797d5376c09ea8087acea0380bad4f959f963922ba4279c57dd28dde5c9260589c68b73541d8c08248be SHA512 da737d6c37c56867cae53f893259f941fd07fe3d19fa77ab4f4f81cd2b432b0ee30cd643187729aab9ba709c2c5753a7398d38c828c44a1090e5d9be6d3a70e5 +EBUILD tn5250-0.17.4-r2.ebuild 1190 BLAKE2B 12e610edc7efeb7e0ff561db603c1f9e3e14ee6b95336eb81046ecce1554b350015d7316054ff5b3f8b78fae206ba7f070e9ab05ca2f0ce1c6ff6ccb3b830b98 SHA512 95631351a044b1328ccfc1006d1a4f6941b698a84eb7800697ef52e0f30a978bfa0ebb22af5e7a376dbcb97b4dfa7f7b0701adb9d7ceb85e6d057e4e7d3974db MISC metadata.xml 215 BLAKE2B a53a3a3ece4a9e09b8df96f5f8a629b7119c0e95e3e428c185f25378748975728f080e999a5e434e6fb3a38bb6599562ffacb8197f0be3ece1bcc43ccc1954de SHA512 0e99f231bdcff1306e232af176e4ce38c754ea988c072324093f2ac5bca81432abeb12af3e5f1960d0047bcd6d8c558fc995d1e6670556e00e443ebb1b6fe09c diff --git a/net-misc/tn5250/files/disable-sslv2-and-sslv3.patch b/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch index 9c8d04f55851..9c8d04f55851 100644 --- a/net-misc/tn5250/files/disable-sslv2-and-sslv3.patch +++ b/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch diff --git a/net-misc/tn5250/files/fix-Wformat-security-warnings.patch b/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch index 4927bce546f2..4927bce546f2 100644 --- a/net-misc/tn5250/files/fix-Wformat-security-warnings.patch +++ b/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch diff --git a/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch b/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch new file mode 100644 index 000000000000..46469c4def8e --- /dev/null +++ b/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,7 @@ + AC_MSG_ERROR([** You need a curses-compatible library installed.]) + fi + fi ++ AC_SEARCH_LIBS(stdscr, tinfo, [CURSES_LIB="$CURSES_LIB -ltinfo"]) + AC_SUBST([CURSES_LIB]) + if test "$ac_cv_use_old_keys" != "yes"; + then diff --git a/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch b/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch new file mode 100644 index 000000000000..fbcece25af27 --- /dev/null +++ b/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch @@ -0,0 +1,13 @@ +--- a/linux/Makefile.am ++++ b/linux/Makefile.am +@@ -18,10 +18,6 @@ + if [ "$$(uname -s)" = "Linux" ]; then \ + if which tic >/dev/null 2>&1 ; then \ + if [ "`whoami`" = "root" ]; then \ +- rm -f /usr/share/terminfo/x/xterm-5250 ; \ +- rm -f /usr/share/terminfo/5/5250 ; \ +- rm -f /usr/lib/terminfo/x/xterm-5250 ; \ +- rm -f /usr/lib/terminfo/5/5250 ; \ + good=yes ; \ + tic $(srcdir)/5250.terminfo || good=no ; \ + else \ diff --git a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild index 3bcbdbd72cb6..f3cfbf0f6174 100644 --- a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild +++ b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit autotools ltprune DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers" HOMEPAGE="http://tn5250.sourceforge.net/" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="X libressl ssl" +IUSE="libressl ssl static-libs" RDEPEND=" sys-libs/ncurses:= @@ -21,32 +21,27 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} - X? ( x11-libs/libXt ) +DEPEND=" + ${RDEPEND} " PATCHES=( - "${FILESDIR}/disable-sslv2-and-sslv3.patch" - "${FILESDIR}/fix-Wformat-security-warnings.patch" + "${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch + "${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch + "${FILESDIR}"/${PN}-0.17.4-tinfo.patch + "${FILESDIR}"/${PN}-0.17.4-whoami.patch ) src_prepare() { default - - # Next, the Makefile for the terminfo settings tries to remove - # some files it doesn't have access to. We can just remove those - # lines. - sed -i \ - -e "/rm -f \/usr\/.*\/terminfo.*5250/d" linux/Makefile.in \ - || die "sed Makefile.in failed" + eautoreconf } src_configure() { econf \ - --disable-static \ - --without-python \ - $(use_with X x) \ - $(use_with ssl) + $(use_enable static-libs static) \ + $(use_with ssl) \ + --without-python } src_install() { diff --git a/net-misc/vncrec/Manifest b/net-misc/vncrec/Manifest index 51877a2c51ef..5f46b1b99b2b 100644 --- a/net-misc/vncrec/Manifest +++ b/net-misc/vncrec/Manifest @@ -1,4 +1,4 @@ AUX vncrec-0.2-includes.patch 565 BLAKE2B c8144aabbf6380fa55edeabbfe31d5d4b30b3e215c6f319295ca117a838595a24293307553b338897694c5b20049b6015365c3f377084c61cfa02a7a15af844a SHA512 256bad5e63e2e744ec7a1f1ca2002bb8caf7d9cff8a787c426a7950c0acf1ee4af27342e68f5f6440a292c35d31cebf98b7f085e8feddfa92d4cd7f64d04b651 DIST vncrec-0.2.tar.gz 65768 BLAKE2B e4879b0af0deda6b4ee4a66bc965c5054601bbc3f6e2ce78956530d9705bd24480ba7fc60822ce32975b9d768725572fc4f6f5d998f929c4ac487ff5fbd6326c SHA512 dd2eb979311e1d04d45aa44362bb7d747719547d3c45ebf18174e7fbcc5bd5be039d53c39077411b636564ea14c0287317f11b16633fa64da314c983250c3ef4 -EBUILD vncrec-0.2-r1.ebuild 910 BLAKE2B de1a3b081b04b93820b6b60b67dbca29133cb611f632de998df95aa1ab4c6aa5538a7bd1100fab0f0d9b0bdf2a13b4f3ca3b9a6c874d7558b7067fda23fb964d SHA512 0e8e7c1b8a229fc328864b52c6a04ee5e0b3687fc79aab793892c515f4efffafcdb9881037a48ce08b72190c726b358703bdbbcf0655d2882436df99cbb3d733 +EBUILD vncrec-0.2-r2.ebuild 876 BLAKE2B a94b25bc4245da56280721d7eafdab3258a24dfd4f7b55843605e68288332025a02ff3a5f8d32e33fd3c4fdb384c616a9753f2ffd4760f4f9b3e9b2c401a8a90 SHA512 202f95d86f1dce3401bde2f47d57576133f1d35916d9351174961524fe0a640e0704856eb8a7838849ba29deb9ab74088e495e301e8a0d69b33812d2f1910f2d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/vncrec/vncrec-0.2-r1.ebuild b/net-misc/vncrec/vncrec-0.2-r2.ebuild index ef08f35b48b7..759d2b27ac5f 100644 --- a/net-misc/vncrec/vncrec-0.2-r1.ebuild +++ b/net-misc/vncrec/vncrec-0.2-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit eutils toolchain-funcs +EAPI=6 +inherit toolchain-funcs DESCRIPTION="VNC session recorder and player" HOMEPAGE="http://www.sodan.org/~penny/vncrec/" @@ -14,26 +13,28 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -RDEPEND="x11-libs/libXaw +RDEPEND=" + x11-libs/libXaw x11-libs/libXext x11-libs/libXmu - x11-libs/libXp x11-libs/libXpm - x11-libs/libXt" + x11-libs/libXt +" DEPEND="${RDEPEND} app-text/rman x11-misc/gccmakedep x11-misc/imake - x11-proto/xextproto" + x11-proto/xextproto +" DOCS=( README README.vnc ) src_prepare() { - epatch "${FILESDIR}"/${P}-includes.patch + default + + eapply "${FILESDIR}"/${P}-includes.patch touch vncrec/vncrec.man || die - sed -i Imakefile \ - -e '/make Makefiles/d' \ - || die "sed Imakefile" + sed -i Imakefile -e '/make Makefiles/d' || die } src_configure() { diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 9bf8f8e02278..b2e70e0e6f64 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,10 +1,10 @@ DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 -DIST youtube-dl-2018.02.04.tar.gz 2895562 BLAKE2B dd81345019afa82706e3f4ce617b89dc77bc12c904e245bb1605a82dc1ed83805679dd11be056463ad2cb584e1774f43f9e3b8e5e55694c58d7a06fd4e65aea0 SHA512 0f39fbcdc3ae4169fec3938fe4f13466e87ba977921b3af1a61571430b145ead21557962834a4e3d3d2660110ee1772602abc779e8cdd61c3ee57a6638f2418e -DIST youtube-dl-2018.02.11.tar.gz 2901130 BLAKE2B f803cc7a94362e4ff20b57a64383c6751fbf56906c4d3cf8bdc882cd0edf8f74b211212334b9fcb81bedfc3bb0e907a4c1a5089d1d2a2478c2371373f1e415f7 SHA512 74731f346873074cd8e9f45f24f9fb1c0a9f37aabb6aa5fcff5e5e43085cfc700eff384531262a39c453c30cf18f27733b1d02709468906cb787ed3153cf2768 +DIST youtube-dl-2018.02.25.tar.gz 2910276 BLAKE2B f9ec8a0fd091a94153ddfb6952502479fa10f994cd6e8c5357f211209bdb3741c756a51d68b27bc07a5f424f3486171ac6b5a9243e4d72f0492e2f4a0d58aabe SHA512 5cd1bcbfad34019090da33210656e71e72b0fca1c95157a0186a67efbbe2157caff42fc1e4401411376a6b53eaae57fd45e368bb4454773514a5dd5108a341a4 +DIST youtube-dl-2018.02.26.tar.gz 2910402 BLAKE2B 4cf4cf0971962ca5aa688f91ca56eda6bd582e0244f233264dc0ce8b7ee26e3cbad59c60b2c3e11e024c1a2816ddb87d1c2228f8111c8ee0ea1459bf301b5068 SHA512 ca89b8c68a321855a37a56a1126f105b5d18a39bf24ad1ce662a157f4e9074658fa3c2b11f1cf3f1d33d448e2e4cc509d9a9e9d3e71c35933bcf11af702dfc5b EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 EBUILD youtube-dl-2017.11.15.ebuild 2378 BLAKE2B d4103998f29f54f2ca5ff154e4bf4dee3f78e618cd8c049cbcb1d8fca987363c5eeab8d02e8bc4e24ccf80937b43e895056aa888fc9755edeb7308730fe306d8 SHA512 294f5c1cf25cc3fd59c16c6d7ca7091051ebc491e8cbd475ec09d70b7d9a8e369de5de5b2c2aa21c97aee344dfe0b91a4cfc2aa55abaf495ca25bb0e0400b2b8 -EBUILD youtube-dl-2018.02.04.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50 -EBUILD youtube-dl-2018.02.11.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50 +EBUILD youtube-dl-2018.02.25.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50 +EBUILD youtube-dl-2018.02.26.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2018.02.04.ebuild b/net-misc/youtube-dl/youtube-dl-2018.02.25.ebuild index db51a779b025..db51a779b025 100644 --- a/net-misc/youtube-dl/youtube-dl-2018.02.04.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2018.02.25.ebuild diff --git a/net-misc/youtube-dl/youtube-dl-2018.02.11.ebuild b/net-misc/youtube-dl/youtube-dl-2018.02.26.ebuild index db51a779b025..db51a779b025 100644 --- a/net-misc/youtube-dl/youtube-dl-2018.02.11.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2018.02.26.ebuild |