diff options
Diffstat (limited to 'net-misc')
84 files changed, 2142 insertions, 1210 deletions
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild new file mode 100644 index 000000000000..7ae884123756 --- /dev/null +++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild @@ -0,0 +1,313 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit autotools linux-info lua-single systemd toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + +IUSE_VOICEMAIL_STORAGE=( + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-historic-no-var-run-install.patch" + "${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch" + "${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch" + "${FILESDIR}/asterisk-13.18.1-r2-autoconf-2.70.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + dev-libs/jansson + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( net-libs/pjproject ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + $(use_with caps cap) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(usex "$1" enable disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISE_BUILD=yes menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do + _menuselect --enable $o menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + emake DESTDIR="${D}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs + chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed" + chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed" + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc &&doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi +} diff --git a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild new file mode 100644 index 000000000000..92c3f4458217 --- /dev/null +++ b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild @@ -0,0 +1,322 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit autotools linux-info lua-single systemd toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-historic-no-var-run-install.patch" + "${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch" + "${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch" + "${FILESDIR}/asterisk-16.15.1-r2-autoconf-2.70.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11 + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9 ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISY_BUILD=yes menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + emake DESTDIR="${D}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs + chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed." + chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed." + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc &&doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi +} diff --git a/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch new file mode 100644 index 000000000000..68a5604757b2 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch @@ -0,0 +1,10 @@ +--- asterisk-13.38.1/configure.ac.o 2021-01-08 18:33:41.360112920 +0200 ++++ asterisk-13.38.1/configure.ac 2021-01-08 18:38:26.649995123 +0200 +@@ -605,7 +605,6 @@ + + AC_FUNC_ALLOCA + AC_HEADER_DIRENT +-AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/types.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h]) + diff --git a/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch new file mode 100644 index 000000000000..99c597540192 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch @@ -0,0 +1,14 @@ +--- asterisk-16.15.1/configure.ac.o 2021-01-08 18:41:50.979913016 +0200 ++++ asterisk-16.15.1/configure.ac 2021-01-08 18:42:23.739899786 +0200 +@@ -612,11 +612,6 @@ + AC_MSG_ERROR([*** Could not find dirent header that defines 'DIR'.]) + fi + +-AC_HEADER_STDC +-if test "$ac_cv_header_stdc" != "yes"; then +- AC_MSG_ERROR([*** ANSI C header files not found.]) +-fi +- + AC_HEADER_SYS_WAIT + if test "$ac_cv_header_sys_wait_h" != "yes"; then + AC_MSG_ERROR([*** POSIX.1 compatible sys/wait.h is required.]) diff --git a/net-misc/asterisk/files/asterisk.tmpfiles2.conf b/net-misc/asterisk/files/asterisk.tmpfiles2.conf new file mode 100644 index 000000000000..ce85c7f5461a --- /dev/null +++ b/net-misc/asterisk/files/asterisk.tmpfiles2.conf @@ -0,0 +1 @@ +d /var/run/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml index b890fb438239..6559f261346c 100644 --- a/net-misc/asterisk/metadata.xml +++ b/net-misc/asterisk/metadata.xml @@ -10,7 +10,9 @@ <name>Proxy Maintainers</name> </maintainer> <use> + <flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag> <flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag> + <flag name="codec2">Enable Codec2 support in asterisk</flag> <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag> <flag name="gtalk">Enable support for Google Talk services</flag> <flag name="http">Enable embedded web server</flag> diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild new file mode 100644 index 000000000000..78ae825186b6 --- /dev/null +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 perl-functions + +DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="ppp" +PATCHES=( + "${FILESDIR}/dahdi-nondigium-blacklist.patch" + "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" + "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" + "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" + "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" +) + +DEPEND="dev-libs/newt + net-misc/dahdi + sys-kernel/linux-headers + virtual/libusb:0 + ppp? ( net-dialup/ppp )" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" + sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." + sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." +} + +src_install() { + local bashcompdir="$(get_bashcompdir)" + local bashcmd bashcmdtarget + + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install + emake DESTDIR="${ED}" install-config + + dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest + + # install init scripts + newinitd "${FILESDIR}"/dahdi.init2 dahdi + newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf + newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf + + bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || + die "Error parsing dahdi bash completion file for commands") + + rm "${ED}"/usr/$(get_libdir)/libtonezone.{la,a} || die "Unable to remove static libs from install." +} diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index ab159fa35b0a..fd12a6dd7e2b 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -17,4 +17,5 @@ DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304 +DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild new file mode 100644 index 000000000000..6a86455478f1 --- /dev/null +++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-mod linux-info toolchain-funcs + +MY_P="${P/dahdi/dahdi-linux}" +JNET=1.0.14 +GENTOO=3.1.0-r3 +S="${WORKDIR}/${MY_P}" + +JNET_DRIVERS="cwain qozap ztgsm" + +DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz + https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="flash oslec" + +PATCHES=( "${WORKDIR}/dahdi-patchset" ) + +CONFIG_CHECK="MODULES PCI ~CRC_CCITT" + +pkg_pretend() { + use oslec && CONFIG_CHECK+=" ECHO" + check_extra_config +} + +src_unpack() { + unpack ${A} + # Copy the firmware tarballs over, the makefile will try and download them otherwise + for file in ${A} ; do + [[ "${file}" = dahdi-fw* ]] || continue + cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || + die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" + done + # But without the .bin's it'll still fall over and die, so copy those too. + mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || + die "Error moving firmware files into the right folders." + + for drv in ${JNET_DRIVERS}; do + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.c from jnet to DAHDI." + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.h from jnet to DAHDI." + done +} + +src_prepare() { + if use flash; then + sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || + die "Failed to define FXSFLASH" + sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ + include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" + fi + if use oslec; then + sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ + drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." + fi + default +} + +src_compile() { + unset ARCH + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" all +} + +src_install() { + einfo "Installing kernel module" + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" install + + # Remove the blank "version" files (these files are all empty, and root owned). + find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" + + # If the kernel sources have a System.map, and there a suitable depmod + # available (seemingly when we're not cross-compiling), then the kernel + # sources depmod kicks in. Remove the files caused by that. + find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" +} diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild index 5adaa5ca5af1..52e3c8070bdb 100644 --- a/net-misc/dhcp/dhcp-4.4.1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild index bb7874ae4e8d..fd057d9a21eb 100644 --- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild @@ -18,8 +18,8 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86" -IUSE="+client ipv6 kernel_linux ldap libressl selinux server ssl vim-syntax" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86" +IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" acct-group/dhcp @@ -162,6 +162,7 @@ src_configure() { --enable-paranoia --enable-early-chroot --sysconfdir=${e} + --with-randomdev=/dev/random $(use_enable ipv6 dhcpv6) $(use_with ldap) $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) @@ -174,6 +175,7 @@ src_configure() { 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') \ + --with-randomdev=/dev/random \ --disable-symtable \ --without-make-clean } diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index c3060e71bd1a..51d79ca53a60 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,3 +1,4 @@ +DIST dhcpcd-8.1.9-patches-01.tar.xz 3208 BLAKE2B 38f59096c7fbe7beb3df11e492d3ef1d116645eefe0722870dd0ca7b5a9b562c2f8302343f33d22359e37623d66874eb5f9981c9f4e521a80629678edff6d0d8 SHA512 13f10f84d44f5cfbf262d4aeb4134121c99629062a8075247b2b35ad5d1927914139bdc8f897644e501239763b409d5eedb9bc30f86456a4af622ab20fe6ffcb DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild index 78cc0a1b8c4c..87278eab090f 100644 --- a/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild +++ b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,8 @@ 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" + SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz + https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi @@ -27,6 +28,11 @@ COMMON_DEPEND="udev? ( virtual/udev )" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" +src_prepare() { + default + eapply "${WORKDIR}"/patches +} + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest deleted file mode 100644 index 03967da4a1a3..000000000000 --- a/net-misc/dhcpd-pools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dhcpd-pools-2.21.tar.xz 544940 BLAKE2B 22c6fd4f461480f95b0671309389dd90a5d1ae6cc64e1a61a6c450f1a861855b682a8c276ebc4517cf627ca7cb435cf6f4917d25c86c3bc40396b92ad8ae156d SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975 diff --git a/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild b/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild deleted file mode 100644 index c31edfee8187..000000000000 --- a/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="ISC dhcpd lease analysis and reporting" -HOMEPAGE="https://dhcpd-pools.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -DEPEND="dev-libs/uthash - doc? ( app-doc/doxygen )" -RDEPEND="" - -src_configure() { - econf $(use_enable doc doxygen) --with-dhcpd-conf=/etc/dhcp/dhcpd.conf -} diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml deleted file mode 100644 index 2b46ec8b220c..000000000000 --- a/net-misc/dhcpd-pools/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">dhcpd-pools</remote-id> - </upstream> - <origin>gentoo-staging</origin> -</pkgmetadata> diff --git a/net-misc/dropbear/dropbear-2020.80-r1.ebuild b/net-misc/dropbear/dropbear-2020.80-r2.ebuild index 88a15ff55baa..8ae9dcf02790 100644 --- a/net-misc/dropbear/dropbear-2020.80-r1.ebuild +++ b/net-misc/dropbear/dropbear-2020.80-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -106,5 +106,7 @@ src_install() { mv "${ED}"/usr/bin/{,db}scp || die fi - pamd_mimic system-remote-login dropbear auth account password session + if use pam; then + pamd_mimic system-remote-login dropbear auth account password session + fi } diff --git a/net-misc/dropbear/dropbear-2020.81-r1.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild index b52672266a08..2ff85973af9a 100644 --- a/net-misc/dropbear/dropbear-2020.81-r1.ebuild +++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild @@ -118,5 +118,7 @@ src_install() { mv "${ED}"/usr/bin/{,db}scp || die fi - pamd_mimic system-remote-login dropbear auth account password session + if use pam; then + pamd_mimic system-remote-login dropbear auth account password session + fi } diff --git a/net-misc/dropbear/dropbear-2020.81.ebuild b/net-misc/dropbear/dropbear-2020.81.ebuild deleted file mode 100644 index 1224921683b2..000000000000 --- a/net-misc/dropbear/dropbear-2020.81.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit savedconfig pam - -DESCRIPTION="small SSH 2 client/server designed for small memory environments" -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" -SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 - https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" - -LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" - -LIB_DEPEND=" - zlib? ( sys-libs/zlib[static-libs(+)] ) - >=dev-libs/libtommath-1.2.0[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) -" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" -RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" - -REQUIRED_USE="pam? ( !static )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.46-dbscp.patch -) - -set_options() { - progs=( - dropbear dbclient dropbearkey - $(usex minimal "" "dropbearconvert scp") - ) - makeopts=( - MULTI=$(usex multicall 1 0) - ) -} - -src_prepare() { - default - sed \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - default_options.h > localoptions.h || die - sed \ - -e '/pam_start/s:sshd:dropbear:' \ - -i svr-authpam.c || die - restore_config localoptions.h -} - -src_configure() { - # XXX: Need to add libtomcrypt to the tree and re-enable this. - # --disable-bundled-libtom - # We disable the hardening flags as our compiler already enables them - # by default as is appropriate for the target. - local myeconfargs=( - --disable-harden - --enable-bundled-libtom - $(use_enable zlib) - $(use_enable pam) - $(use_enable !bsdpty openpty) - $(use_enable shadow) - $(use_enable static) - $(use_enable syslog) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" -} - -src_install() { - set_options - emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install - doman *.8 - newinitd "${FILESDIR}"/dropbear.init.d dropbear - newconfd "${FILESDIR}"/dropbear.conf.d dropbear - dodoc CHANGES README SMALL MULTI - - # The multi install target does not install the links right. - if use multicall ; then - cd "${ED}"/usr/bin || die - local x - for x in "${progs[@]}" ; do - ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" - done - rm -f dropbear - dodir /usr/sbin - dosym ../bin/dropbearmulti /usr/sbin/dropbear - cd "${S}" || die - fi - save_config localoptions.h - - if ! use minimal ; then - mv "${ED}"/usr/bin/{,db}scp || die - fi - - pamd_mimic system-remote-login dropbear auth account password session -} diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 208ad85a7eb0..66607fd465e0 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,4 +1,6 @@ DIST dropbox-lnx.x86-112.4.321.tar.gz 99004752 BLAKE2B adec5e29703d36ceadcaed1447b03d5edfd2249f06ab295c55c87684bf4b4c9c59a49a59b71158c17908753cb4dac51e17629cc2fb07c4b44d32d094cecae8e5 SHA512 222cb754713233b05fcf918995ca21d5b5663757304d1303534007872ea83e432641fa13b758b21dcd24568b63fd88b3fed1e45d15b0422226040e655796d369 DIST dropbox-lnx.x86-113.4.507.tar.gz 100113763 BLAKE2B 6340195b5d6d47b077e4a7b335c4c1d3298d6504503fb39bc71e407d7e8e09cd80afaed9df84dd4e7ea875a8adf28279d9d348f54905958034152fd201b4e4cf SHA512 4e74df30a7debd5c8e2aca4a2494178392d6646bc7dd1966a3aa730b43f0759251a046a7e9266ce68f683786ef9998e71718be1769c574019d688b6420f7ee17 +DIST dropbox-lnx.x86-114.4.426.tar.gz 100421824 BLAKE2B 1070be0d3607c8f3df0277dcae282bce704578d9c02fd191f32503dc1f152e6861b3945d19b186eda23ac8676b8e7da31050bc954a25e1b33fb4a4098d22f48c SHA512 d64ecd9889ab46c50ee6e2d7978afca3fa34fe3093f68ce2b328e488bb536a61a54c9c835be32765200e382dbaab3d8c025cf185998371793fb202c0998ab5f2 DIST dropbox-lnx.x86_64-112.4.321.tar.gz 103084021 BLAKE2B 96c15e627434557663712bd6f679efd11b8a6e353757becf1a09830e6f16fb5652159af9601ae1ca84ec397aee277161bcaf1988589b782c43ec433b7ed69a66 SHA512 e22c5595ba5dc90e3fcc958be92ac5fb403f76d8567a03bcfb14e5ea058147f23564de6a2d020a37da4f5a0c34dc85ccbc528bf1f1c683b370899e22f6e652ab DIST dropbox-lnx.x86_64-113.4.507.tar.gz 103671827 BLAKE2B 32bab397f2a964c63a733bdd5834cae5a872346fd56f539ce55df91755e8d4c9195e77723ca9d345fea5769163d15cd19406d28c9d4ff76b61d45ec77d729b78 SHA512 473282044032bab21e0d24c6987343b1cfdad98a4f608336d6c6af50e613e201ed71d56e5d231252e2eb3df236cdbba7c74ef1b6378fa88b1bce5995113d660d +DIST dropbox-lnx.x86_64-114.4.426.tar.gz 104003045 BLAKE2B f71e9aba191f7258588aeb2cf2459eb0d9311c5c56e711f9b2932b8dfe2070cc0f1a20d3cfc9fc710ad75093e18fa494f9a42a6ff23d3e231e76edd29146612a SHA512 c9d42944e81fdb1ad315c388acdfba4b3da53bf90b6265c8ca030152c39ac0a60e8d064b1c47df7d8ecaca8b0801ad0851a2252d2241580cfc479cbf76e9fc3b diff --git a/net-misc/dropbox/dropbox-114.4.426.ebuild b/net-misc/dropbox/dropbox-114.4.426.ebuild new file mode 100644 index 000000000000..a77b20f7a3b2 --- /dev/null +++ b/net-misc/dropbox/dropbox-114.4.426.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop pax-utils systemd xdg + +DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" +HOMEPAGE="https://www.dropbox.com/" +SRC_URI=" + amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="selinux X" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/.*" +QA_EXECSTACK="opt/dropbox/dropbox" + +BDEPEND="dev-util/patchelf" + +# Be sure to have GLIBCXX_3.4.9, #393125 +RDEPEND=" + X? ( + x11-themes/hicolor-icon-theme + ) + selinux? ( sec-policy/selinux-dropbox ) + app-arch/bzip2 + dev-libs/glib:2 + dev-libs/libffi-compat:6 + media-libs/fontconfig + media-libs/freetype + net-misc/wget + sys-libs/zlib + sys-libs/ncurses-compat:5 + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 +" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die + mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die + mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die + rmdir "${S}"/dropbox-lnx.*-${PV}/ || die + rmdir .dropbox-dist || die +} + +src_prepare() { + default + # we supply all of these in RDEPEND + rm -vf libGL.so.1 libX11* libffi.so.6 || die + # some of these do not appear to be used + rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ + PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ + wmctrl libdrm.so.2 libpopt.so.0 || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf images || die + fi + patchelf --set-rpath '$ORIGIN' \ + apex._apex.*.so \ + nucleus_python.*.so \ + tprt.*.so \ + || die + pax-mark cm dropbox + mv README ACKNOWLEDGEMENTS "${T}" || die +} + +src_install() { + local targetdir="/opt/dropbox" + + insinto "${targetdir}" + doins -r * + fperms a+x "${targetdir}"/{dropbox,dropboxd} + dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" + + use X && doicon -s 16 -c status "${T}"/status + + make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" + + newinitd "${FILESDIR}"/dropbox.initd dropbox + newconfd "${FILESDIR}"/dropbox.conf dropbox + systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" + + dodoc "${T}"/{README,ACKNOWLEDGEMENTS} +} + +pkg_postinst() { + einfo "Warning: while running, dropbox may attempt to autoupdate itself in" + einfo " your user's home directory. To prevent this, run the following as" + einfo " each user who will run dropbox:" + einfo "" + einfo "install -dm0 ~/.dropbox-dist" +} diff --git a/net-misc/electrum/electrum-4.0.9.ebuild b/net-misc/electrum/electrum-4.0.9-r1.ebuild index 2f5746be30b4..6920ee16d1bd 100644 --- a/net-misc/electrum/electrum-4.0.9.ebuild +++ b/net-misc/electrum/electrum-4.0.9-r1.ebuild @@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] dev-python/bitstring[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] - <dev-python/dnspython-2[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/PySocks[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index 28ec6a69300b..8550886958e7 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,3 +1,4 @@ DIST gallery-dl-1.15.2.tar.gz 323739 BLAKE2B 99a06331bd7dc6ec951749129ad0ac797d9ce2d9f98e75a29198fd47d0481c43b96922ea08149abfe990e8994a19b3170853618de9b51465264d100dba777f32 SHA512 7f31c0485d9de6eaf76e7b0772e66049f9aa8fd7d77d3ef6fd2803d7ec7dddbf3419051c9d8b3984eb86a8fbbf9a168cf8ec69a55082a38e2ca23cfc3574b1f4 DIST gallery-dl-1.15.3.tar.gz 325926 BLAKE2B 9ae31ba89a60460cd041fe9f353d4a7d1dab14fe63a8967f1a94f8d0ea42ef30032e5f734cbb370f5ac681f9274ba756a156acc7bd11ca4b5aad387fdc6be76f SHA512 618dc26ba74274c961cce1ef058fce3e12741366329ce50d09421245987a88a796be3f1a31926e8b2c33cc87cddcde3585f74f4f1a80347153c2a7a9cab7e3c0 DIST gallery-dl-1.16.0.tar.gz 327915 BLAKE2B 8d7805219f900ab66afc400a56b279a18ebb78c47a531b380af2d1578c338f84575f1fb5a006a5e1bb0684349d595550dc89177493890001e38077edd34e00b5 SHA512 84cd8ab4b3e4a63f912e36454e6f35adb9f9c395002d04391c4093d4efe62ff249999eda3755f0ce77b4d4b7ce11ccfb2acb972cd5144ea84b00d61e370f5de7 +DIST gallery-dl-1.16.3.tar.gz 333058 BLAKE2B df45afa7c745a6176e8490bdcef95b7e1eb63b8c8ea61abf5422928fc72b5bedb101336c2470fb8edde0d12ce48d8d5f0eb4ab44acf6dc032eed2412e55ca30f SHA512 abb3223c13d67297bfd8cd94ac0efa66d7f6315ff589bb8b5ab96a3487015b91e8ab27e9ee43f4ee1dbbc7b69676c73cf4d4833bcd868295332aca417008c0e1 diff --git a/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild new file mode 100644 index 000000000000..57c4d7a6c58a --- /dev/null +++ b/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="sqlite,ssl,xml" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 optfeature + +DESCRIPTION="Download image galleries and collections from several image hosting sites" +HOMEPAGE="https://github.com/mikf/gallery-dl" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mikf/${PN}.git" +else + SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +# tests require network access +RESTRICT="test" +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" + +distutils_enable_tests setup.py + +src_compile() { + emake data/completion/gallery-dl + emake data/completion/_gallery-dl + emake man + distutils-r1_src_compile +} + +pkg_postinst() { + elog "To get additional features, some optional runtime dependencies" + elog "may be installed:" + elog "" + optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg + optfeature "video downloads" net-misc/youtube-dl +} diff --git a/net-misc/httpie/httpie-2.3.0.ebuild b/net-misc/httpie/httpie-2.3.0.ebuild index b09979b45948..790bc14dee74 100644 --- a/net-misc/httpie/httpie-2.3.0.ebuild +++ b/net-misc/httpie/httpie-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild new file mode 100644 index 000000000000..a92334c81619 --- /dev/null +++ b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# eutils inherit required for make_wrapper call +inherit desktop eutils multilib xdg-utils + +DESCRIPTION="ICA Client for Citrix Presentation servers" +HOMEPAGE="https://www.citrix.com/" +SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) + x86? ( linuxx86-${PV}.tar.gz )" + +LICENSE="icaclient" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN" +RESTRICT="mirror strip userpriv fetch" + +ICAROOT="/opt/Citrix/ICAClient" + +QA_PREBUILT="${ICAROOT#/}/*" + +RDEPEND=" + app-crypt/libsecret + dev-libs/atk + dev-libs/glib:2 + dev-libs/libxml2 + media-fonts/font-adobe-100dpi + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + media-fonts/font-xfree86-type1 + media-fonts/font-misc-ethiopic + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/libogg + media-libs/libvorbis + media-libs/speex + net-libs/libsoup:2.4 + net-libs/webkit-gtk:4 + sys-apps/util-linux + sys-libs/libcxx + sys-libs/libcxxabi + sys-libs/zlib + virtual/krb5 + virtual/jpeg:0 + virtual/libudev + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + x11-libs/pango +" +DEPEND="" + +pkg_nofetch() { + elog "Download the client file ${A} from + https://www.citrix.com/downloads/workspace-app/" + elog "and place it into your DISTDIR directory." +} + +pkg_setup() { + case ${ARCH} in + amd64) + ICAARCH=linuxx64 + ;; + x86) + ICAARCH=linuxx86 + ;; + *) + eerror "Given architecture is not supported by Citrix." + ;; + esac + + S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" +} + +src_prepare() { + default + rm lib/UIDialogLibWebKit.so || die + + # We need to avoid module.ini file getting added to the package's + # content because media-plugins/hdx-realtime-media-engine modifies + # this file on installation. See pkg_postinst() + mv nls/en/module.ini "${T}" || die +} + +src_install() { + local bin tmpl dest + + dodir "${ICAROOT}" + + exeinto "${ICAROOT}" + doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord + + exeinto "${ICAROOT}"/lib + if use amd64 ; then + rm lib/ctxjpeg_fb_8.so || die + fi + doexe lib/*.so + + for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do + insinto "${dest}" + doins nls/en.UTF-8/eula.txt + done + + insinto "${ICAROOT}" + doins -r usb + + insinto "${ICAROOT}"/config + # nls/en/*.ini is being handled by pkg_postinst() + doins config/* config/.* + for tmpl in {appsrv,wfclient}.template ; do + newins nls/en/${tmpl} ${tmpl/template/ini} + done + touch "${ED}/${ICAROOT}"/config/.server || die + + insinto "${ICAROOT}"/gtk + doins gtk/* + + insinto "${ICAROOT}"/gtk/glade + doins gtk/glade/* + + insinto "${ICAROOT}"/site + doins -r site/* + + dodir "${ICAROOT}"/help + + insinto "${ICAROOT}"/config/usertemplate + doins config/usertemplate/* + + local lang LANGCODES=( en ) + use l10n_de && LANGCODES+=( de ) + use l10n_es && LANGCODES+=( es ) + use l10n_fr && LANGCODES+=( fr ) + use l10n_ja && LANGCODES+=( ja ) + use l10n_zh-CN && LANGCODES+=( zh_CN ) + + for lang in ${LANGCODES[@]} ; do + insinto "${ICAROOT}"/nls/${lang} + doins nls/${lang}/* + + insinto "${ICAROOT}"/nls/$lang/UTF-8 + doins nls/${lang}.UTF-8/* + + insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES + doins nls/${lang}/LC_MESSAGES/* + + insinto "${ICAROOT}"/nls/${lang} + dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8 + + for tmpl in {appsrv,wfclient}.template ; do + cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \ + "${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \ + || die + done + done + + insinto "${ICAROOT}"/nls + dosym en /opt/Citrix/ICAClient/nls/C + + insinto "${ICAROOT}"/icons + doins icons/* + + insinto "${ICAROOT}"/keyboard + doins keyboard/* + + rm -r "${S}"/keystore/cacerts || die + dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + + local util_files=( + configmgr + conncenter + ctx_app_bind + ctx_rehash + ctxlogd + ctxwebhelper + gst_play1.0 + gst_read1.0 + hdxcheck.sh + icalicense.sh + libgstflatstm1.0.so + lurdump + new_store + nslaunch + pnabrowse + setlog + storebrowse + sunraymac.sh + webcontainer + what + xcapture + ) + + exeinto "${ICAROOT}"/util + for bin in ${util_files[@]} ; do + doexe util/${bin} + done + + # https://bugs.gentoo.org/655922 + dosym gst_play1.0 "${ICAROOT}"/util/gst_play + dosym gst_read1.0 "${ICAROOT}"/util/gst_read + dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so + + doenvd "${FILESDIR}"/10ICAClient + + for bin in configmgr conncenter new_store ; do + make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util + done + + for bin in selfservice wfica ; do + make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}" + done + + dodir /etc/revdep-rebuild/ + echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \ + > "${ED}"/etc/revdep-rebuild/70icaclient + + insinto "${ICAROOT}"/pkginf + newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}" + + # 651926 + domenu "${FILESDIR}"/*.desktop +} + +pkg_postinst() { + xdg_desktop_database_update + + local inidest="${BROOT}${ICAROOT}/config" + if [[ ! -e "${inidest}"/module.ini ]] ; then + mv "${T}"/module.ini "${inidest}/" \ + || ewarn 'Failed to install plugin.ini file' + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/net-misc/iputils/files/iputils-20200821-fclose.patch b/net-misc/iputils/files/iputils-20200821-fclose.patch new file mode 100644 index 000000000000..cc370f0a5561 --- /dev/null +++ b/net-misc/iputils/files/iputils-20200821-fclose.patch @@ -0,0 +1,45 @@ +From e1c3d09b412ad0d022178344b8cbf748dc60f17f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 24 Jan 2021 23:29:27 -0500 +Subject: [PATCH] tftpd: recvfile: avoid closing the file twice + +The close_stream function calls fclose, so don't call it again. + +This resolves an abort in glibc: + + Message: Process 1038079 (tftpd) of user 65534 dumped core. + + Stack trace of thread 1038079: + #0 0x00007f5f650ed204 raise (libc.so.6 + 0x39204) + #1 0x00007f5f650d6547 abort (libc.so.6 + 0x22547) + #2 0x00007f5f6512f25f n/a (libc.so.6 + 0x7b25f) + #3 0x00007f5f651372fa n/a (libc.so.6 + 0x832fa) + #4 0x00007f5f65138dc2 n/a (libc.so.6 + 0x84dc2) + #5 0x00007f5f65124b2f fclose (libc.so.6 + 0x70b2f) + #6 0x000055571a50de73 recvfile (tftpd + 0x2e73) + #7 0x000055571a50e064 tftp (tftpd + 0x3064) + #8 0x000055571a50e387 tftpd_inetd (tftpd + 0x3387) + #9 0x000055571a50e50f main (tftpd + 0x350f) + #10 0x00007f5f650d7e6d __libc_start_main (libc.so.6 + 0x23e6d) + #11 0x000055571a50d3ca _start (tftpd + 0x23ca) + +Fixes: 5d6be65 ("tftpd: remove global variables by using a run state struct") + +Reviewed-by: Petr Vorel <pvorel@suse.cz> +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + tftpd/tftpd.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c +index 42998f9b..a09d32ba 100644 +--- a/tftpd/tftpd.c ++++ b/tftpd/tftpd.c +@@ -387,7 +387,6 @@ void recvfile(struct run_state *ctl, struct formats *pf) + write_behind(ctl->file, pf->f_convert); + if (close_stream(ctl->file)) + syslog(LOG_ERR, "tftpd: write error: %s\n", strerror(errno)); +- fclose(ctl->file); /* close data file */ + + ap->th_opcode = htons((uint16_t)ACK); /* send the "final" ack */ + ap->th_block = htons(block); diff --git a/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch b/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch new file mode 100644 index 000000000000..5b69e5c88fb7 --- /dev/null +++ b/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch @@ -0,0 +1,43 @@ +From 469b41ac89b9f6772ea31df8379669d205be95f8 Mon Sep 17 00:00:00 2001 +From: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt> +Date: Mon, 24 Aug 2020 19:34:53 +0100 +Subject: [PATCH] common: fix infinite loop when getrandom fails + +Fixes: https://github.com/iputils/iputils/issues/291 +--- + iputils_common.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/iputils_common.c b/iputils_common.c +index 58eacd0..c41f201 100644 +--- a/iputils_common.c ++++ b/iputils_common.c +@@ -98,18 +98,24 @@ static unsigned int iputil_srand_fallback(void) + void iputils_srand(void) + { + unsigned int i; ++ + #if HAVE_GETRANDOM + ssize_t ret; + +- while ((ret = getrandom(&i, sizeof(i), GRND_NONBLOCK)) != sizeof(i)) { +- switch(errno) { ++ do { ++ errno = 0; ++ ret = getrandom(&i, sizeof(i), GRND_NONBLOCK); ++ switch (errno) { ++ case 0: ++ break; + case EINTR: + continue; + default: + i = iputil_srand_fallback(); +- break; ++ goto done; + } +- } ++ } while (ret != sizeof(i)); ++ done: + #else + i = iputil_srand_fallback(); + #endif diff --git a/net-misc/iputils/files/iputils-20200821-install-sbindir.patch b/net-misc/iputils/files/iputils-20200821-install-sbindir.patch new file mode 100644 index 000000000000..cb1575841ccd --- /dev/null +++ b/net-misc/iputils/files/iputils-20200821-install-sbindir.patch @@ -0,0 +1,29 @@ +From 8d1420f3019cd1caccf2ffa15a5873f0c61ab529 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 24 Jan 2021 22:39:03 -0500 +Subject: [PATCH] tftpd: install into sbindir + +The xinet.d config expects the daemon to live in sbindir. + +Closes: https://github.com/iputils/iputils/pull/310 + +Reviewed-by: Petr Vorel <pvorel@suse.cz> +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + tftpd/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tftpd/meson.build b/tftpd/meson.build +index 6e508a24..b4cf6812 100644 +--- a/tftpd/meson.build ++++ b/tftpd/meson.build +@@ -3,7 +3,8 @@ inc = include_directories('..') + executable('tftpd', ['tftpd.c', 'tftpsubs.c', git_version_h], + include_directories : inc, + link_with : [libcommon], +- install: true) ++ install: true, ++ install_dir: sbindir) + + subs = configuration_data() + subs.set('sbindir', sbindir) diff --git a/net-misc/iputils/iputils-20200821.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild index 035fe9df7914..a048e91a579b 100644 --- a/net-misc/iputils/iputils-20200821.ebuild +++ b/net-misc/iputils/iputils-20200821-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" @@ -61,7 +61,11 @@ fi [ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" -PATCHES=() +PATCHES=( + "${FILESDIR}/iputils-20200821-getrandom-fallback.patch" + "${FILESDIR}/iputils-20200821-fclose.patch" + "${FILESDIR}/iputils-20200821-install-sbindir.patch" +) src_prepare() { default diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index e01a2b2ce3f9..0ac5f7fa2ee4 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,2 +1 @@ -DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c diff --git a/net-misc/memcached/memcached-1.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild deleted file mode 100644 index eb56679ca024..000000000000 --- a/net-misc/memcached/memcached-1.5.22.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils flag-o-matic systemd - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="https://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 sparc x86 ~amd64-linux ~x86-linux ~ppc-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} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-1.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" - "${FILESDIR}/${PN}-1.5.21-hash-fix-build-failure-against-gcc-10.patch" -) - -src_prepare() { - 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() { - 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/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild index 8105514abf97..7cf0a9f1ee88 100644 --- a/net-misc/memcached/memcached-1.6.9.ebuild +++ b/net-misc/memcached/memcached-1.6.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest index a26674766936..ed93deb0fd10 100644 --- a/net-misc/nemesis/Manifest +++ b/net-misc/nemesis/Manifest @@ -1,2 +1 @@ -DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8 DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b diff --git a/net-misc/nemesis/files/nemesis-1.4-fileio.patch b/net-misc/nemesis/files/nemesis-1.4-fileio.patch deleted file mode 100644 index d39cef3d6508..000000000000 --- a/net-misc/nemesis/files/nemesis-1.4-fileio.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/src/nemesis-fileio.c -+++ b/src/nemesis-fileio.c -@@ -63,7 +63,7 @@ - fp = stdin; - fd = fileno(fp); - } -- else if ((fd = open(file, O_RDONLY)) < 0) -+ else if ((fp = fopen(file, "rb")) < 0) - { - #if !defined(WIN32) - fprintf(stderr, "ERROR: Unable to open %s file: %s. %s\n", -@@ -82,8 +82,12 @@ - return -1; - } - -+#ifdef DEBUG -+ printf("DEBUG: trying to read max %u bytes from %s\n", maxsize, file); -+#endif -+ - /* read() can return negative values on successful reads, test for -1 */ -- if ((bytesread = read(fd, (void *)memory, maxsize)) == -1) -+ if ((bytesread = fread((void *)memory, 1, maxsize, fp)) == -1) - { - #if !defined(WIN32) - fprintf(stderr, "ERROR: Unable to read %s file: %s. %s\n", -@@ -106,6 +110,11 @@ - if (strncmp(file, "-", 1)) - close(fd); - } -+ -+#ifdef DEBUG -+ printf("DEBUG: bytes read from %s: %u.\n", file, bytesread); -+#endif -+ - return bytesread; - } - diff --git a/net-misc/nemesis/files/nemesis-1.4-fno-common.patch b/net-misc/nemesis/files/nemesis-1.4-fno-common.patch deleted file mode 100644 index 068fef61b6e4..000000000000 --- a/net-misc/nemesis/files/nemesis-1.4-fno-common.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- a/src/nemesis.c -+++ b/src/nemesis.c -@@ -12,6 +12,8 @@ - #include <string.h> - #include "nemesis.h" - -+int mode; /* injection mode */ -+ - int main(int argc, char **argv) - { - char **avtmp, *avval; ---- a/src/nemesis-dns.c -+++ b/src/nemesis-dns.c -@@ -37,6 +37,8 @@ - static void dns_validatedata(void); - static void dns_verbose(void); - -+int state; /* default to UDP */ -+ - void nemesis_dns(int argc, char **argv) - { - const char *module = "DNS Packet Injection"; ---- a/src/nemesis-dns.h -+++ b/src/nemesis-dns.h -@@ -32,7 +32,7 @@ - #include <libnet-1.0.h> - #include "nemesis.h" - --int state; /* default to UDP */ -+extern int state; /* default to UDP */ - - int builddns(ETHERhdr *, IPhdr *, TCPhdr *, UDPhdr *, DNShdr *, FileData *, - FileData *, FileData *, char *); ---- a/src/nemesis.h -+++ b/src/nemesis.h -@@ -122,6 +122,8 @@ - extern int got_ipoptions; - extern int got_tcpoptions; - -+extern int mode; /* injection mode */ -+ - typedef struct _FileData - { - int32_t file_s; /* file size */ ---- a/src/nemesis-icmp.c -+++ b/src/nemesis-icmp.c -@@ -38,6 +38,8 @@ - static void icmp_validatedata(void); - static void icmp_verbose(void); - -+int got_origoptions; -+ - void nemesis_icmp(int argc, char **argv) - { - const char *module = "ICMP Packet Injection"; ---- a/src/nemesis-icmp.h -+++ b/src/nemesis-icmp.h -@@ -42,8 +42,7 @@ - #include <libnet-1.0.h> - #include "nemesis.h" - --int mode; /* ICMP injection mode */ --int got_origoptions; -+extern int got_origoptions; - - int buildicmp(ETHERhdr *, IPhdr *, ICMPhdr *, IPhdr *, FileData *, FileData *, - FileData *, char *); ---- a/src/nemesis-ospf.c -+++ b/src/nemesis-ospf.c -@@ -15,6 +15,37 @@ - #include <pcap.h> - #endif - -+u_short id, /* IP id */ -+ frag, /* frag shit */ -+ mtusize, /* Max dgram length (DBD) */ -+ num, /* LSA_RTR num */ -+ interval, /* secs since last pkt sent */ -+ rtr_flags, /* LSA_RTR flags */ -+ metric, /* OSPF metric */ -+ ospf_age; /* OSPF advertisement age */ -+ -+u_long source, /* source address */ -+ dest, /* destination address */ -+ neighbor, /* neighbor router */ -+ as_fwd, /* AS_EXT forward address */ -+ addrid, /* advertising router id */ -+ addaid, /* advertising area id */ -+ router, /* advertising router */ -+ auth[2], /* authentication type */ -+ mask; /* subnet mask (icmp_mask) */ -+ -+u_char priority, /* OSPF priority */ -+ exchange, /* DBD exchange type */ -+ rtrtype, /* LSA_RTR type */ -+ ooptions; /* OSPF options */ -+ -+u_int dead_int, /* dead router interval in secs */ -+ as_tag, /* AS_EXT tag */ -+ seqnum, /* seqnum for LSA */ -+ bcastnum, /* num of LSAs to bcast (LSU) */ -+ rtrdata, /* LSA_RTR router data */ -+ rtrid; /* router id for LSA */ -+ - static ETHERhdr etherhdr; - static IPhdr iphdr; - static OSPFhdr ospfhdr; ---- a/src/nemesis-ospf.h -+++ b/src/nemesis-ospf.h -@@ -35,7 +35,7 @@ - #include <libnet-1.0.h> - #include "nemesis.h" - --u_short id, /* IP id */ -+extern u_short id, /* IP id */ - frag, /* frag shit */ - mtusize, /* Max dgram length (DBD) */ - num, /* LSA_RTR num */ -@@ -44,7 +44,7 @@ - metric, /* OSPF metric */ - ospf_age; /* OSPF advertisement age */ - --u_long source, /* source address */ -+extern u_long source, /* source address */ - dest, /* destination address */ - neighbor, /* neighbor router */ - as_fwd, /* AS_EXT forward address */ -@@ -54,20 +54,18 @@ - auth[2], /* authentication type */ - mask; /* subnet mask (icmp_mask) */ - --u_char priority, /* OSPF priority */ -+extern u_char priority, /* OSPF priority */ - exchange, /* DBD exchange type */ - rtrtype, /* LSA_RTR type */ - ooptions; /* OSPF options */ - --u_int dead_int, /* dead router interval in secs */ -+extern u_int dead_int, /* dead router interval in secs */ - as_tag, /* AS_EXT tag */ - seqnum, /* seqnum for LSA */ - bcastnum, /* num of LSAs to bcast (LSU) */ - rtrdata, /* LSA_RTR router data */ - rtrid; /* router id for LSA */ - --int mode; /* OSPF injection mode */ -- - int buildospf(ETHERhdr *, IPhdr *, FileData *, FileData *, char *); - - #endif /* __NEMESIS_OSPF_H__ */ diff --git a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch deleted file mode 100644 index a5a0a83d54a0..000000000000 --- a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch +++ /dev/null @@ -1,158 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -128,22 +128,21 @@ - dnl LIBS="${LIBS} -L${with_libpcap_libraries}" - dnl fi - --CPPFLAGS="${CPPFLAGS} `libnet-config --defines`" --CFLAGS="${CFLAGS} -funroll-loops -pipe" -+CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`" - --if test `libnet-config --cflags | wc -c` = "1"; then -+if test `libnet-1.0-config --cflags | wc -c` = "1"; then - CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" - LIBNET_CONFIG_BROKEN_CFLAGS=yes - else -- CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`" -+ CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`" - fi - --if test `libnet-config --libs | wc -c` = "1"; then -- AC_MSG_WARN(libnet-config --libs is broken on your system. If you) -+if test `libnet-1.0-config --libs | wc -c` = "1"; then -+ AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you) - AC_MSG_WARN(are using a precompiled package please notify the maintainer.) - LIBS="${LIBS} -L/usr/local/lib -L/sw/lib" - else -- LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`" -+ LIBS="${LIBS} `libnet-1.0-config --libs`" - fi - - AC_DEFUN(HEADER_FAIL_MESSAGE,[ -@@ -185,7 +184,7 @@ - AC_CHECK_LIB(resolv, hstrerror) - - LNET="" --AC_CHECK_LIB(net, libnet_build_ip,, LNET="no") -+AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no") - - if test "$LNET" = "no"; then - echo -@@ -193,7 +192,7 @@ - echo " http://www.packetfactory.net/projects/libnet/" - echo " or use the --with-libnet-* options, if you have it installed" - echo " in unusual place" -- exit -+ exit 1 - fi - - dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then -@@ -216,7 +215,7 @@ - AC_CHECK_HEADERS(unistd.h errno.h strings.h netdb.h limits.h machine/endian.h sys/time.h sys/param.h arpa/inet.h netinet/in.h) - - LNET="" --AC_CHECK_HEADERS(libnet.h,, LNET="no") -+AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no") - - if test "$LNET" = "no"; then - echo -@@ -235,29 +234,29 @@ - libnet_dir="/usr/include /usr/local/include /sw/include" - fi - else -- libnet_dir=`libnet-config --cflags | cut -dI -f2` -+ libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` - fi - - LIBNET_INC_DIR="" - for i in $libnet_dir; do -- if test -r $i/libnet.h; then -+ if test -r $i/libnet-1.0.h; then - LIBNET_INC_DIR=$i - fi - done - - if test "$LIBNET_INC_DIR" != ""; then -- 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 - AC_MSG_RESULT(no) - echo - echo " ERROR! Nemesis will *only* work with libnet version 1.0.2a," - echo " go get it from" - echo " http://www.packetfactory.net/projects/libnet/" -- HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR) -+ HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR) - fi - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -- HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir) -+ HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir) - fi - - dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then ---- a/src/nemesis-arp.h -+++ b/src/nemesis-arp.h -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-dns.h -+++ b/src/nemesis-dns.h -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-ethernet.h -+++ b/src/nemesis-ethernet.h -@@ -29 +29 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-functions.c -+++ b/src/nemesis-functions.c -@@ -37 +37 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-icmp.h -+++ b/src/nemesis-icmp.h -@@ -31 +31 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-igmp.h -+++ b/src/nemesis-igmp.h -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-ip.h -+++ b/src/nemesis-ip.h -@@ -26 +26 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-ospf.h -+++ b/src/nemesis-ospf.h -@@ -33 +33 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-rip.h -+++ b/src/nemesis-rip.h -@@ -33 +33 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-tcp.h -+++ b/src/nemesis-tcp.h -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-udp.h -+++ b/src/nemesis-udp.h -@@ -30 +30 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis.h -+++ b/src/nemesis.h -@@ -15 +15 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/nemesis-printout.c -+++ b/src/nemesis-printout.c -@@ -34 +34 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch deleted file mode 100644 index b4a4e7c71378..000000000000 --- a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/nemesis-proto_tcp.c -+++ b/src/nemesis-proto_tcp.c -@@ -16,7 +16,7 @@ - FileData *ipod, FileData *tcpod, char *device) - { - int n; -- u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0; -+ u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0, tcp_headerlen = 0, ip_headerlen = 0; - static u_int8_t *pkt; - static int sockfd = -1; - struct libnet_link_int *l2 = NULL; -@@ -58,13 +58,20 @@ - #endif - } - -+ ip_headerlen = LIBNET_IP_H + ipod->file_s; -+ tcp_headerlen = LIBNET_TCP_H + tcpod->file_s; -+ - tcp_packetlen = link_offset + LIBNET_IP_H + LIBNET_TCP_H + pd->file_s + - ipod->file_s + tcpod->file_s; - -- tcp_meta_packetlen = tcp_packetlen - (link_offset + LIBNET_IP_H); -+ tcp_meta_packetlen = LIBNET_TCP_H + pd->file_s; - - #ifdef DEBUG -+ printf("DEBUG: link offsetlength %u.\n", link_offset); -+ printf("DEBUG: IP header length %u.\n", ip_headerlen); -+ printf("DEBUG: TCP header length %u.\n", tcp_headerlen); - printf("DEBUG: TCP packet length %u.\n", tcp_packetlen); -+ printf("DEBUG: TCP meta length %u.\n", tcp_meta_packetlen); - printf("DEBUG: IP options size %u.\n", ipod->file_s); - printf("DEBUG: TCP options size %u.\n", tcpod->file_s); - printf("DEBUG: TCP payload size %u.\n", pd->file_s); diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild deleted file mode 100644 index e1f2dc280bca..000000000000 --- a/net-misc/nemesis/nemesis-1.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux" -HOMEPAGE="https://sourceforge.net/projects/nemesis/" -SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 sparc x86" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - =net-libs/libnet-1.0* -" - -DOCS="CREDITS ChangeLog README" - -PATCHES=( - "${FILESDIR}"/${P}-fileio.patch - "${FILESDIR}"/${P}-libnet-1.0.patch - "${FILESDIR}"/${P}-prototcp.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/nemesis/nemesis-1.4-r2.ebuild b/net-misc/nemesis/nemesis-1.4-r2.ebuild deleted file mode 100644 index 133a2ca5d37f..000000000000 --- a/net-misc/nemesis/nemesis-1.4-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux" -HOMEPAGE="https://sourceforge.net/projects/nemesis/" -SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~sparc ~x86" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - =net-libs/libnet-1.0* -" - -DOCS="CREDITS ChangeLog README" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4-fileio.patch - "${FILESDIR}"/${PN}-1.4-libnet-1.0.patch - "${FILESDIR}"/${PN}-1.4-prototcp.patch - "${FILESDIR}"/${PN}-1.4-fno-common.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild index 1a2b3b50ee4e..9b64b5b6e695 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -64,7 +64,10 @@ src_install() { doman ${b}/${b}.1 if [[ ${b} != rcp ]]; then newins "${FILESDIR}"/${b}.xinetd ${b} - newpamd "${FILESDIR}/${b}.pamd-pambase" ${b} + + if use pam; then + newpamd "${FILESDIR}/${b}.pamd-pambase" ${b} + fi fi fi done diff --git a/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch b/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch new file mode 100644 index 000000000000..cfa642dd29b0 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch @@ -0,0 +1,265 @@ +From a58a89213bf4d0cefb155fef1ec9425f7a6ca5c8 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Tue, 19 Jan 2021 05:04:31 +0000 +Subject: [PATCH] DHCP: Support dhcpcd-9.x + +This locks NM into dhcpcd-9.3.3 as that is the first version to support +the --noconfigure option. Older versions are no longer supported by NM +because they do modify the host which is undesirable. + +Due to the way dhcpcd-9 uses privilege separation and that it re-parents +itself to PID 1, the main process cannot be reaped or waited for. +So we rely on dhcpcd correctly cleaning up after itself. +A new function nm_dhcp_client_stop_watch_child() has been added +so that dhcpcd can perform similar cleanup to the equivalent stop call. + +As part of this change, the STOP and STOPPED reasons are mapped to +NM_DHCP_STATE_DONE and PREINIT is mapped to a new state NM_DHCP_STATE_NOOP +which means NM should just ignore this state. + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/668 +--- + NEWS | 3 ++ + src/dhcp/nm-dhcp-client.c | 20 +++++++++- + src/dhcp/nm-dhcp-client.h | 3 ++ + src/dhcp/nm-dhcp-dhcpcd.c | 82 ++++++++++++++++++++------------------- + 4 files changed, 67 insertions(+), 41 deletions(-) + +diff --git a/NEWS b/NEWS +index 8a48587e5..958bbe91c 100644 +--- a/NEWS ++++ b/NEWS +@@ -45,6 +45,9 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! + cmdline argument actually generates a connection which disables both + ipv4 and ipv6. Previously the generated connection would disable ipv4 + but ipv6 would be set to the 'auto' method. ++* The dhcpcd plugin now requires a minimum version of dhcpcd-9.3.3 with ++ the --noconfigure option. Using an older version will cause dhcpcd to ++ exit with a status code of 1. + + ============================================= + NetworkManager-1.26 +diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c +index 46ab48959..56f599abf 100644 +--- a/src/dhcp/nm-dhcp-client.c ++++ b/src/dhcp/nm-dhcp-client.c +@@ -367,10 +367,13 @@ reason_to_state(NMDhcpClient *self, const char *iface, const char *reason) + else if (g_ascii_strcasecmp(reason, "nak") == 0 || g_ascii_strcasecmp(reason, "expire") == 0 + || g_ascii_strcasecmp(reason, "expire6") == 0) + return NM_DHCP_STATE_EXPIRE; +- else if (g_ascii_strcasecmp(reason, "end") == 0) ++ else if (g_ascii_strcasecmp(reason, "end") == 0 || g_ascii_strcasecmp(reason, "stop") == 0 ++ || g_ascii_strcasecmp(reason, "stopped") == 0) + return NM_DHCP_STATE_DONE; + else if (g_ascii_strcasecmp(reason, "fail") == 0 || g_ascii_strcasecmp(reason, "abend") == 0) + return NM_DHCP_STATE_FAIL; ++ else if (g_ascii_strcasecmp(reason, "preinit") == 0) ++ return NM_DHCP_STATE_NOOP; + + _LOGD("unmapped DHCP state '%s'", reason); + return NM_DHCP_STATE_UNKNOWN; +@@ -547,6 +550,18 @@ nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid) + priv->watch_id = g_child_watch_add(pid, daemon_watch_cb, self); + } + ++void ++nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid) ++{ ++ NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); ++ ++ g_return_if_fail(priv->pid == pid); ++ priv->pid = -1; ++ ++ watch_cleanup(self); ++ timeout_cleanup(self); ++} ++ + gboolean + nm_dhcp_client_start_ip4(NMDhcpClient *self, + GBytes * client_id, +@@ -874,6 +889,9 @@ nm_dhcp_client_handle_event(gpointer unused, + state_to_string(new_state), + reason); + ++ if (new_state == NM_DHCP_STATE_NOOP) ++ return TRUE; ++ + if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) { + GVariantIter iter; + const char * name; +diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h +index 05faa9ea5..46446849a 100644 +--- a/src/dhcp/nm-dhcp-client.h ++++ b/src/dhcp/nm-dhcp-client.h +@@ -55,6 +55,7 @@ typedef enum { + NM_DHCP_STATE_EXPIRE, /* lease expired or NAKed */ + NM_DHCP_STATE_FAIL, /* failed for some reason */ + NM_DHCP_STATE_TERMINATED, /* client is no longer running */ ++ NM_DHCP_STATE_NOOP, /* state is a non operation for NetworkManager */ + __NM_DHCP_STATE_MAX, + NM_DHCP_STATE_MAX = __NM_DHCP_STATE_MAX - 1, + } NMDhcpState; +@@ -183,6 +184,8 @@ void nm_dhcp_client_start_timeout(NMDhcpClient *self); + + void nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid); + ++void nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid); ++ + void nm_dhcp_client_set_state(NMDhcpClient *self, + NMDhcpState new_state, + NMIPConfig * ip_config, +diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c +index b2b5d28bd..7cb003859 100644 +--- a/src/dhcp/nm-dhcp-dhcpcd.c ++++ b/src/dhcp/nm-dhcp-dhcpcd.c +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: GPL-2.0+ */ + /* +- * Copyright (C) 2008 Roy Marples ++ * Copyright (C) 2008,2020 Roy Marples <roy@marples.name> + * Copyright (C) 2010 Dan Williams <dcbw@redhat.com> + */ + +@@ -40,7 +40,6 @@ static GType nm_dhcp_dhcpcd_get_type(void); + /*****************************************************************************/ + + typedef struct { +- char * pid_file; + NMDhcpListener *dhcp_listener; + } NMDhcpDhcpcdPrivate; + +@@ -71,39 +70,37 @@ ip4_start(NMDhcpClient *client, + const char * last_ip4_address, + GError ** error) + { +- NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client); +- NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE(self); +- gs_unref_ptrarray GPtrArray *argv = NULL; +- pid_t pid = -1; +- GError * local = NULL; +- gs_free char * cmd_str = NULL; +- gs_free char * binary_name = NULL; ++ NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client); ++ gs_unref_ptrarray GPtrArray *argv = NULL; ++ pid_t pid; ++ GError * local; ++ gs_free char * cmd_str = NULL; + const char * iface; + const char * dhcpcd_path; + const char * hostname; + +- g_return_val_if_fail(priv->pid_file == NULL, FALSE); ++ pid = nm_dhcp_client_get_pid(client); ++ g_return_val_if_fail(pid == -1, FALSE); + + iface = nm_dhcp_client_get_iface(client); + +- /* dhcpcd does not allow custom pidfiles; the pidfile is always +- * RUNSTATEDIR "dhcpcd-<ifname>.pid". +- */ +- priv->pid_file = g_strdup_printf(RUNSTATEDIR "/dhcpcd-%s.pid", iface); +- + dhcpcd_path = nm_dhcp_dhcpcd_get_path(); + if (!dhcpcd_path) { + nm_utils_error_set_literal(error, NM_UTILS_ERROR_UNKNOWN, "dhcpcd binary not found"); + return FALSE; + } + +- /* Kill any existing dhcpcd from the pidfile */ +- binary_name = g_path_get_basename(dhcpcd_path); +- nm_dhcp_client_stop_existing(priv->pid_file, binary_name); +- + argv = g_ptr_array_new(); + g_ptr_array_add(argv, (gpointer) dhcpcd_path); + ++ /* Don't configure anything, we will do that instead. ++ * This requires dhcpcd-9.3.3 or newer. ++ * Older versions only had an option not to install a default route, ++ * dhcpcd still added addresses and other routes so we no longer support that ++ * as it doesn't fit how NetworkManager wants to work. ++ */ ++ g_ptr_array_add(argv, (gpointer) "--noconfigure"); ++ + g_ptr_array_add(argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */ + + g_ptr_array_add(argv, (gpointer) "-K"); /* Disable built-in carrier detection */ +@@ -113,8 +110,6 @@ ip4_start(NMDhcpClient *client, + /* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */ + g_ptr_array_add(argv, (gpointer) "-A"); + +- g_ptr_array_add(argv, (gpointer) "-G"); /* Let NM handle routing */ +- + g_ptr_array_add(argv, (gpointer) "-c"); /* Set script file */ + g_ptr_array_add(argv, (gpointer) nm_dhcp_helper_path); + +@@ -146,8 +141,8 @@ ip4_start(NMDhcpClient *client, + if (!g_spawn_async(NULL, + (char **) argv->pdata, + NULL, +- G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL +- | G_SPAWN_STDERR_TO_DEV_NULL, ++ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL ++ | G_SPAWN_DO_NOT_REAP_CHILD, + nm_utils_setpgid, + NULL, + &pid, +@@ -169,23 +164,32 @@ ip4_start(NMDhcpClient *client, + static void + stop(NMDhcpClient *client, gboolean release) + { +- NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client); +- NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE(self); +- int errsv; +- +- NM_DHCP_CLIENT_CLASS(nm_dhcp_dhcpcd_parent_class)->stop(client, release); +- +- if (priv->pid_file) { +- if (remove(priv->pid_file) == -1) { +- errsv = errno; +- _LOGD("could not remove dhcp pid file \"%s\": %d (%s)", +- priv->pid_file, +- errsv, +- nm_strerror_native(errsv)); +- } ++ NMDhcpDhcpcd *self = NM_DHCP_DHCPCD(client); ++ pid_t pid; ++ int sig, errsv; ++ ++ pid = nm_dhcp_client_get_pid(client); ++ sig = release ? SIGALRM : SIGTERM; ++ _LOGD("sending %s to dhcpcd pid %d", sig == SIGALRM ? "SIGALRM" : "SIGTERM", pid); ++ ++ /* dhcpcd-9.x features privilege separation. ++ * It's not our job to track all these processes so we rely on dhcpcd ++ * to always cleanup after itself. ++ * Because it also re-parents itself to PID 1, the process cannot be ++ * reaped or waited for. ++ * As such, just send the correct signal. ++ */ ++ if (kill(pid, sig) == -1) { ++ errsv = errno; ++ _LOGE("failed to kill dhcpcd %d:%s", errsv, strerror(errsv)); + } + +- /* FIXME: implement release... */ ++ /* When this function exits NM expects the PID to be -1. ++ * This means we also need to stop watching the pid. ++ * If we need to know the exit status then we need to refactor NM ++ * to allow a non -1 to mean we're waiting to exit still. ++ */ ++ nm_dhcp_client_stop_watch_child(client, pid); + } + + /*****************************************************************************/ +@@ -214,8 +218,6 @@ dispose(GObject *object) + g_clear_object(&priv->dhcp_listener); + } + +- nm_clear_g_free(&priv->pid_file); +- + G_OBJECT_CLASS(nm_dhcp_dhcpcd_parent_class)->dispose(object); + } + +-- +2.30.0 + diff --git a/net-misc/networkmanager/networkmanager-1.28.0.ebuild b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild index ddc31e838b34..57097199d609 100644 --- a/net-misc/networkmanager/networkmanager-1.28.0.ebuild +++ b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= @@ -100,6 +100,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PN}-1.28.0-dhcpcd9.patch" +) + python_check_deps() { if use introspection; then has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index aa2d1d67deea..49cce531d585 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index ce7e422fd68f..7de62087eed7 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1 +1,2 @@ DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b +DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71 diff --git a/net-misc/ntpsec/ntpsec-1.2.0.ebuild b/net-misc/ntpsec/ntpsec-1.2.0.ebuild new file mode 100644 index 000000000000..1e8bc4e6c03f --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.2.0.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE='threads(+)' + +inherit flag-o-matic python-r1 waf-utils systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" +else + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" + RESTRICT="mirror" + 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 libbsd nist ntpviz samba seccomp smear tests" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" + +# net-misc/pps-tools oncore,pps +CDEPEND="${PYTHON_DEPS} + sys-libs/libcap + dev-python/psutil[${PYTHON_USEDEP}] + libbsd? ( dev-libs/libbsd:0= ) + dev-libs/openssl:0= + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND="${CDEPEND} + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + !net-misc/ntp + !net-misc/openntpd + acct-group/ntp + acct-user/ntp +" +DEPEND="${CDEPEND} + >=app-text/asciidoc-8.6.8 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + sys-devel/bison + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch" + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" +) + +WAF_BINARY="${S}/waf" + +src_prepare() { + default + # Remove autostripping of binaries + sed -i -e '/Strip binaries/d' wscript + if ! use libbsd ; then + epatch "${FILESDIR}/${PN}-no-bsd.patch" + fi + # remove extra default pool servers + sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf + 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|,$||'`" + + local myconf=( + --nopyc + --nopyo + --enable-pylib ext + --refclock="${CLOCKSTRING}" + --build-epoch="$(date +%s)" + $(use doc || echo "--disable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(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() { + python_install() { + waf-utils_src_install + } + python_foreach_impl run_in_build_dir python_install + python_foreach_impl python_optimize + + # 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-r1.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 + keepdir /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/ + + # move doc files to /usr/share/doc/"${P}" + use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html +} + +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/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild index 2da4b0963c23..d3b7370a9078 100644 --- a/net-misc/nx/nx-3.5.99.25.ebuild +++ b/net-misc/nx/nx-3.5.99.25.ebuild @@ -113,8 +113,9 @@ src_compile() { emake -C nx-X11 BuildDependsOnly # Parallel make issue resurfaced, upstream working on autotools switch emake -j1 -C nx-X11 World \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ - SHLIBDIR="/usr/$(get_libdir)" + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" emake -C nxproxy } @@ -122,10 +123,11 @@ src_compile() { src_install() { emake \ DESTDIR="${D}" \ - PREFIX="/usr" \ - NXLIBDIR="/usr/$(get_libdir)/${PN}" \ - SHLIBDIR="/usr/$(get_libdir)" \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ + PREFIX="${EPREFIX}/usr" \ + NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" \ install # Already provided by mesa & related packages diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild index a08c934b082d..c7d9801e42bb 100644 --- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild +++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="constraints libressl selinux" DEPEND=" diff --git a/net-misc/openssh/openssh-8.1_p1-r4.ebuild b/net-misc/openssh/openssh-8.1_p1-r5.ebuild index 8ca157b9c135..e055a207b9d5 100644 --- a/net-misc/openssh/openssh-8.1_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r5.ebuild @@ -399,7 +399,9 @@ src_install() { newinitd "${FILESDIR}"/sshd-r1.initd sshd newconfd "${FILESDIR}"/sshd-r1.confd sshd - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi tweak_ssh_configs diff --git a/net-misc/openssh/openssh-8.2_p1-r7.ebuild b/net-misc/openssh/openssh-8.2_p1-r8.ebuild index b40fb15e5003..595226626d73 100644 --- a/net-misc/openssh/openssh-8.2_p1-r7.ebuild +++ b/net-misc/openssh/openssh-8.2_p1-r8.ebuild @@ -399,7 +399,9 @@ src_install() { newinitd "${FILESDIR}"/sshd-r1.initd sshd newconfd "${FILESDIR}"/sshd-r1.confd sshd - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi tweak_ssh_configs diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild b/net-misc/openssh/openssh-8.3_p1-r6.ebuild index 20705683e44f..ef9e80ab84f4 100644 --- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild +++ b/net-misc/openssh/openssh-8.3_p1-r6.ebuild @@ -418,7 +418,9 @@ src_install() { newinitd "${FILESDIR}"/sshd-r1.initd sshd newconfd "${FILESDIR}"/sshd-r1.confd sshd - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi tweak_ssh_configs diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild index 894176403737..fc00136b3125 100644 --- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild @@ -294,6 +294,9 @@ src_configure() { append-cppflags -DBROKEN_GLOB fi + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + local myconf=( --with-ldflags="${LDFLAGS}" --disable-strip @@ -423,7 +426,9 @@ src_install() { newinitd "${FILESDIR}"/sshd-r1.initd sshd newconfd "${FILESDIR}"/sshd-r1.confd sshd - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi tweak_ssh_configs diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 33ac4b91541a..56f27d40e879 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,3 +1 @@ DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f SHA512 89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963 -DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf -DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch deleted file mode 100644 index 930f326b27b4..000000000000 --- a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5d569e04f33b2c9a8f735d928ad2c9cec9d1c4b5 Mon Sep 17 00:00:00 2001 -From: Antenore Gatta <antenore@simbiosi.org> -Date: Sun, 14 Jun 2020 09:05:18 +0200 -Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228 - -Signed-off-by: Antenore Gatta <antenore@simbiosi.org> ---- - plugins/tool_hello_world/plugin.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c -index 3e277435d..9695fd586 100644 ---- a/plugins/tool_hello_world/plugin.c -+++ b/plugins/tool_hello_world/plugin.c -@@ -42,17 +42,18 @@ - #include <gdk/gdkx.h> - - static RemminaPluginService *remmina_plugin_service = NULL; -+#define REMMINA_PLUGIN_DEBUG(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) - - static void remmina_plugin_tool_init(RemminaProtocolWidget *gp) - { - TRACE_CALL(__func__); -- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME); -+ REMMINA_PLUGIN_DEBUG("[%s] Plugin init", PLUGIN_NAME); - } - - static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp) - { - TRACE_CALL(__func__); -- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME); -+ REMMINA_PLUGIN_DEBUG("[%s] Plugin open connection", PLUGIN_NAME); - - GtkDialog *dialog; - dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR, -@@ -65,7 +66,7 @@ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp) - static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp) - { - TRACE_CALL(__func__); -- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME); -+ REMMINA_PLUGIN_DEBUG("[%s] Plugin close connection", PLUGIN_NAME); - remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect"); - return FALSE; - } --- -GitLab - diff --git a/net-misc/remmina/remmina-1.4.9.ebuild b/net-misc/remmina/remmina-1.4.10-r1.ebuild index 9a2ee2547ae8..42c9eab621b2 100644 --- a/net-misc/remmina/remmina-1.4.9.ebuild +++ b/net-misc/remmina/remmina-1.4.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm64 ~x86" IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" DEPEND=" + app-emulation/spice-protocol dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= diff --git a/net-misc/remmina/remmina-1.4.10.ebuild b/net-misc/remmina/remmina-1.4.10.ebuild index 26a80b64c271..9d4bfcf14a13 100644 --- a/net-misc/remmina/remmina-1.4.10.ebuild +++ b/net-misc/remmina/remmina-1.4.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="~amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" DEPEND=" diff --git a/net-misc/remmina/remmina-1.4.8-r1.ebuild b/net-misc/remmina/remmina-1.4.8-r1.ebuild deleted file mode 100644 index 4222860b8986..000000000000 --- a/net-misc/remmina/remmina-1.4.8-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake optfeature xdg - -MY_P="${PN^}-v${PV}" - -DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client" -HOMEPAGE="https://remmina.org/" -SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" - -DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libsodium:= - net-libs/libsoup - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libxkbfile - appindicator? ( dev-libs/libappindicator:3 ) - crypt? ( dev-libs/libgcrypt:0= ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] - cups? ( net-print/cups:= ) ) - gnome-keyring? ( app-crypt/libsecret ) - kwallet? ( kde-frameworks/kwallet ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - spice? ( net-misc/spice-gtk[gtk3] ) - ssh? ( net-libs/libssh:0=[sftp] - x11-libs/vte:2.91 ) - telepathy? ( net-libs/telepathy-glib ) - vnc? ( net-libs/libvncserver[jpeg] ) - webkit? ( net-libs/webkit-gtk:4 ) - zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) -" -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND=" - ${DEPEND} - virtual/freedesktop-icon-theme -" - -DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - xdg_environment_reset - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_APPINDICATOR=$(usex appindicator) - -DWITH_GCRYPT=$(usex crypt) - -DWITH_EXAMPLES=$(usex examples) - -DWITH_LIBSECRET=$(usex gnome-keyring) - -DWITH_KF5WALLET=$(usex kwallet) - -DWITH_GETTEXT=$(usex nls) - -DWITH_TRANSLATIONS=$(usex nls) - -DWITH_FREERDP=$(usex rdp) - -DWITH_CUPS=$(usex cups) - -DWITH_SPICE=$(usex spice) - -DWITH_LIBSSH=$(usex ssh) - -DWITH_VTE=$(usex ssh) - -DWITH_TELEPATHY=$(usex telepathy) - -DWITH_LIBVNCSERVER=$(usex vnc) - -DWITH_WWW=$(usex webkit) - -DWITH_AVAHI=$(usex zeroconf) - -DWITH_NEWS=$(usex telemetry) - -DWITH_ICON_CACHE=OFF - -DWITH_UPDATE_DESKTOP_DB=OFF - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "To get additional features, some optional runtime dependencies" - elog "may be installed:" - elog "" - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] - optfeature "XDMCP support" x11-base/xorg-server[xephyr] -} diff --git a/net-misc/sb-hosts/Manifest b/net-misc/sb-hosts/Manifest index 6054ef15fd6a..33d944753897 100644 --- a/net-misc/sb-hosts/Manifest +++ b/net-misc/sb-hosts/Manifest @@ -1,2 +1,2 @@ -DIST sb-hosts-3.3.2.tar.gz 9058200 BLAKE2B fc6785876188f75ce011e552be789de8188f36273adfc77c7c6be49a87384aa7203ca59405d6b6e3011646b6354b97a9e5b390e477e4a163454ec63029c2fc8d SHA512 cbe7005d146fcc10b62b22b508c133f292d8c54483d54b49c0eaf1a1db1d2c57c4e12dd83253b1713378a5fa6477822742f8d21e3d61635accd5089ab577e477 -DIST sb-hosts-3.3.3.tar.gz 9060700 BLAKE2B 8f5b48106dd337d9f3dbe95b46bf957ac5d042969bc2207abfea1ac422765e90823fd7ca42e971fc9682b4be38443f60c914e6bfccdb61418e71455b8221eac7 SHA512 328475948dac2138be87f97ad2b918fcb5ce81c224a4d45511db73cea5ab7b7045f907d295c2843abf9dbbfc605ac94f71ea2e97ea4d786a5ecb5fd704d94a31 +DIST sb-hosts-3.3.6.tar.gz 9226837 BLAKE2B 385409239bcbb660e4d025ed0b40947f7a665a7d7f4fc671404a734bf09c83a6695e872cb2d1016301458e638595c9de135afa87c64e56e28e0072c183005432 SHA512 6c83bae40db75b4682bfa542567c508dcbb18f4e493811438a25b56675313c32074b66fd645a579f4cc4d29c07ef2e6bb7e47f7a7342de8196b5000111796659 +DIST sb-hosts-3.3.7.tar.gz 9227349 BLAKE2B 6a764acbd47f7e2a92c3340751ea419e581b1b824c04fa5ce7490d6df90fbd34e995cbcfaafad4f6297e20d7bbacd3c69317bb32b6e37d127b0f09542f5d7a6c SHA512 32301804b68388b5e98c242343c088d6c8a5e0168c899c63f8e7b614ea34b83411ef3bc511f42600cc870bacf5f45297a29c7ecf78c75b2438aae673b4191fe7 diff --git a/net-misc/sb-hosts/sb-hosts-3.3.2.ebuild b/net-misc/sb-hosts/sb-hosts-3.3.6.ebuild index a6b7f045915c..a6b7f045915c 100644 --- a/net-misc/sb-hosts/sb-hosts-3.3.2.ebuild +++ b/net-misc/sb-hosts/sb-hosts-3.3.6.ebuild diff --git a/net-misc/sb-hosts/sb-hosts-3.3.3.ebuild b/net-misc/sb-hosts/sb-hosts-3.3.7.ebuild index a6b7f045915c..a6b7f045915c 100644 --- a/net-misc/sb-hosts/sb-hosts-3.3.3.ebuild +++ b/net-misc/sb-hosts/sb-hosts-3.3.7.ebuild diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index 5fdf7b70acd3..a56e78dcb98b 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,2 +1,3 @@ DIST seafile-client-7.0.10.tar.gz 2368056 BLAKE2B 8b446a818cc3a238bd92831843f1991632e9417ba92d043065aaf43e2a4d74aa00d331e32136a195558dc780ae124c8b1e7b2b2969f3cff8169635df7470f876 SHA512 cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340 DIST seafile-client-7.0.9.tar.gz 2367747 BLAKE2B 60a488a22e094d4783c7da50e8852d7204e16791613d113f729bacc21a40883edc25469f8ce1a8dab52b4ed0ea73b691a831fb0c01a885aeeae7bd276e2781ff SHA512 665a252a321744cd84b96230f5318528aad23a0a089e5049913c34a6c254356c7cc996e45e2a50d432d114f13b089b8d12062b3a1a4d1a0b6f1cbf9688ad32b6 +DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719 diff --git a/net-misc/seafile-client/seafile-client-8.0.1.ebuild b/net-misc/seafile-client/seafile-client-8.0.1.ebuild new file mode 100644 index 000000000000..778e77ff9371 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl shibboleth test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/libevent + dev-libs/jansson + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + net-libs/libsearpc + ~net-misc/seafile-${PV} + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest index 284ee172adde..389c4db13764 100644 --- a/net-misc/seafile/Manifest +++ b/net-misc/seafile/Manifest @@ -1,2 +1,3 @@ DIST seafile-7.0.10.tar.gz 707294 BLAKE2B 7f31d09480a7be09c957a79442bc0c952a4b3802fe17d660cb4ae7d157fcb656280751ed5033e399a705fc24c8b0a232e55e5f289792bdb69abec304c85d3473 SHA512 6c5870e75d52f4409fc6f7e3884d3e9208693997b25a6347980a8d164ec6a3348f4b3f5a532f11b9221822aa0ec9125b9d9af8ba7abc4d392cd5b5f602df9289 DIST seafile-7.0.9.tar.gz 706859 BLAKE2B 2cbd12bfdda9c2cc13d38233a56d0d2f52ad04e03bd14c90c6ff086756fb7ab4f63319906030f9a5f4ec2625dbe23b2892c069f2b5d50c6997b23deaf2cb61d7 SHA512 4c87e7a4a6a4cef631cbfbeb1bde3c8c9e0915d5fe4597d5b3a4b8aa15e9650e97b51ee6a3b0bae4d235ec53149dca01aed7acd704da593c97da0a17e352a75d +DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild new file mode 100644 index 000000000000..7c96fe8c8126 --- /dev/null +++ b/net-misc/seafile/seafile-8.0.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +WANT_AUTOMAKE=1.16 + +inherit autotools python-single-r1 vala + +DESCRIPTION="File syncing and sharing software with file encryption and group sharing" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" +SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + ') + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/jansson + dev-libs/libevent + net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] + net-misc/curl + sys-libs/zlib" +DEPEND="${RDEPEND} + $(vala_depend)" + +src_prepare() { + default + sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die + eautoreconf + vala_src_prepare +} + +src_install() { + default + # Remove unnecessary .la files, as recommended by ltprune.eclass + find "${ED}" -name '*.la' -o -name '*.a' -delete || die + python_fix_shebang "${ED}"/usr/bin +} diff --git a/net-misc/sipsak/files/0.9.6_p1-callback.patch b/net-misc/sipsak/files/0.9.6_p1-callback.patch deleted file mode 100644 index 37dc486d3174..000000000000 --- a/net-misc/sipsak/files/0.9.6_p1-callback.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr sipsak-0.9.6.ORIG/helper.c sipsak-0.9.6/helper.c ---- sipsak-0.9.6.ORIG/helper.c 2015-01-27 14:14:12.208729426 +0000 -+++ sipsak-0.9.6/helper.c 2015-01-27 14:14:55.406728851 +0000 -@@ -250,7 +250,7 @@ - return aptr; - } - --static void cares_callback(void *arg, int status, unsigned char *abuf, int alen) { -+static void cares_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) { - int i; - unsigned int ancount, nscount, arcount; - const unsigned char *aptr; diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 22d39d91ac35..a47d4af7a88d 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,4 +1,3 @@ DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 -DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f SHA512 c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch deleted file mode 100644 index 0b391ed8929a..000000000000 --- a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -2021-01-08: Quick fix to a compilation failure especially on 32 bit systems - ---- socat-1.7.4.0/compat.h -+++ socat-1.7.4.0/compat.h -@@ -134,6 +134,8 @@ - # define F_uint64_t "%u" - # elif HAVE_BASIC_UINT64_T==6 - # define F_uint64_t "%lu" -+# elif HAVE_BASIC_UINT64_T==8 -+# define F_uint64_t "%llu" - # else - # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T - # endif -@@ -147,7 +149,7 @@ - # elif HAVE_BASIC_INT16_T==3 - # define F_int16_t "%d" - # elif HAVE_BASIC_INT16_T==5 --# define F_int16_t "%l" -+# define F_int16_t "%ld" - # else - # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T - # endif -@@ -161,7 +163,7 @@ - # elif HAVE_BASIC_INT32_T==3 - # define F_int32_t "%d" - # elif HAVE_BASIC_INT32_T==5 --# define F_int32_t "%l" -+# define F_int32_t "%ld" - # else - # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T - # endif -@@ -175,7 +177,9 @@ - # elif HAVE_BASIC_INT64_T==3 - # define F_int64_t "%d" - # elif HAVE_BASIC_INT64_T==5 --# define F_int64_t "%l" -+# define F_int64_t "%ld" -+# elif HAVE_BASIC_INT64_T==7 -+# define F_int64_t "%lld" - # else - # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T - # endif diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild deleted file mode 100644 index f0da86377605..000000000000 --- a/net-misc/socat/socat-1.7.4.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="https://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist libressl ssl readline ipv6 tcpd" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}/${P}-32bit_build_fix.patch" -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - filter-flags '-Wno-error*' #293324 - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest index 70597cde5b7f..9946dbce1cca 100644 --- a/net-misc/spiped/Manifest +++ b/net-misc/spiped/Manifest @@ -1 +1,2 @@ DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a +DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae diff --git a/net-misc/spiped/spiped-1.6.1.ebuild b/net-misc/spiped/spiped-1.6.1.ebuild new file mode 100644 index 000000000000..e3f8538c10d4 --- /dev/null +++ b/net-misc/spiped/spiped-1.6.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="secure pipe daemon" +HOMEPAGE="https://www.tarsnap.com/spiped.html" +SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl" + +MY_PN="${PN/d/}" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= )" + +# Blocker added due to #548126 +RDEPEND=" + ${DEPEND} + !net-mail/qlogtools" + +# Some tests fail. +RESTRICT="test" + +src_compile() { + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin "${MY_PN}/${MY_PN}" + dosbin "${PN}/${PN}" + + doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1" + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + dodir "etc/${PN}" +} + +pkg_postinst() { + elog + elog "You will need to configure spiped via its" + elog "configuration file located in /etc/conf.d/." + elog + elog "Please have a look at this file prior to starting up spiped!" + elog +} diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index dfe3771aed86..0335efdca28a 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,2 +1,3 @@ -DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c +DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6 +DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9 diff --git a/net-misc/streamlink/streamlink-1.3.0-r2.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild index e1fca9bd63eb..b755ccfb0ea5 100644 --- a/net-misc/streamlink/streamlink-1.3.0-r2.ebuild +++ b/net-misc/streamlink/streamlink-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,19 +20,18 @@ HOMEPAGE="https://streamlink.github.io/" if [[ ${PV} != 9999* ]]; then SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz" KEYWORDS="~amd64 ~x86" fi LICENSE="BSD-2 Apache-2.0" SLOT="0" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" -# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too DEPEND=" $(python_gen_cond_dep ' >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] dev-python/isodate[${PYTHON_MULTI_USEDEP}] dev-python/websocket-client[${PYTHON_MULTI_USEDEP}] dev-python/pycountry[${PYTHON_MULTI_USEDEP}] @@ -45,36 +44,33 @@ RDEPEND="${DEPEND} " BDEPEND=" $(python_gen_cond_dep ' - doc? ( - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/docutils[${PYTHON_MULTI_USEDEP}] - dev-python/recommonmark[${PYTHON_MULTI_USEDEP}] - ) test? ( dev-python/mock[${PYTHON_MULTI_USEDEP}] dev-python/requests-mock[${PYTHON_MULTI_USEDEP}] dev-python/pytest[${PYTHON_MULTI_USEDEP}] - dev-python/freezegun[${PYTHON_MULTI_USEDEP}] + >=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}] ) ')" +src_prepare() { + distutils-r1_src_prepare + if [[ ${PV} != 9999* ]]; then + mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die + fi +} + python_configure_all() { # Avoid iso-639, iso3166 dependencies since we use pycountry. export STREAMLINK_USE_PYCOUNTRY=1 } -python_compile_all() { - use doc && emake -C docs html man -} - python_test() { esetup.py test } python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi distutils-r1_python_install_all + if [[ ${PV} != 9999* ]]; then + doman ${WORKDIR}/streamlink.1 + fi } diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index e1fca9bd63eb..b755ccfb0ea5 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,19 +20,18 @@ HOMEPAGE="https://streamlink.github.io/" if [[ ${PV} != 9999* ]]; then SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz" KEYWORDS="~amd64 ~x86" fi LICENSE="BSD-2 Apache-2.0" SLOT="0" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" -# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too DEPEND=" $(python_gen_cond_dep ' >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] dev-python/isodate[${PYTHON_MULTI_USEDEP}] dev-python/websocket-client[${PYTHON_MULTI_USEDEP}] dev-python/pycountry[${PYTHON_MULTI_USEDEP}] @@ -45,36 +44,33 @@ RDEPEND="${DEPEND} " BDEPEND=" $(python_gen_cond_dep ' - doc? ( - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/docutils[${PYTHON_MULTI_USEDEP}] - dev-python/recommonmark[${PYTHON_MULTI_USEDEP}] - ) test? ( dev-python/mock[${PYTHON_MULTI_USEDEP}] dev-python/requests-mock[${PYTHON_MULTI_USEDEP}] dev-python/pytest[${PYTHON_MULTI_USEDEP}] - dev-python/freezegun[${PYTHON_MULTI_USEDEP}] + >=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}] ) ')" +src_prepare() { + distutils-r1_src_prepare + if [[ ${PV} != 9999* ]]; then + mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die + fi +} + python_configure_all() { # Avoid iso-639, iso3166 dependencies since we use pycountry. export STREAMLINK_USE_PYCOUNTRY=1 } -python_compile_all() { - use doc && emake -C docs html man -} - python_test() { esetup.py test } python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi distutils-r1_python_install_all + if [[ ${PV} != 9999* ]]; then + doman ${WORKDIR}/streamlink.1 + fi } diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild index 87c73a9db856..e91cd66ba984 100644 --- a/net-misc/suite3270/suite3270-4.0_p13.ebuild +++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~ppc s390 sparc ~x86" IUSE="cjk doc ncurses ssl tcl X" RDEPEND="ssl? ( dev-libs/openssl:0= ) diff --git a/net-misc/ucarp/files/ucarp.initd-r1 b/net-misc/ucarp/files/ucarp.initd-r1 deleted file mode 100644 index 14d84dc01ea4..000000000000 --- a/net-misc/ucarp/files/ucarp.initd-r1 +++ /dev/null @@ -1,58 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="UCARP is a portable implementation of the CARP protocol" -description_logstatus="Logs the status of ${SVCNAME} to syslog" -description_demote="Demotes ${SVCNAME} from master to backup" - -extra_started_commands="logstatus demote" - -command="/usr/sbin/ucarp" -command_args="--interface=${UCARP_INTERFACE} \ - --srcip=${UCARP_SOURCEADDRESS} \ - --vhid=${UCARP_VHID} \ - --passfile=${UCARP_PASSFILE} \ - --addr=${UCARP_VIRTUALADDRESS} \ - --upscript=${UCARP_UPSCRIPT} \ - --downscript=${UCARP_DOWNSCRIPT} \ - --xparam=${UCARP_VIRTUALPREFIX} \ - ${UCARP_OPTS}" - -pidfile="/var/run/${SVCNAME}.pid" -command_background="yes" - -required_files="${UCARP_PASSFILE} ${UCARP_UPSCRIPT} ${UCARP_DOWNSCRIPT}" - -depend() { - need net - use logger - provide ucarp -} - -start_pre() { - local required_vars='UCARP_INTERFACE UCARP_SOURCEADDRESS UCARP_VHID - UCARP_PASSFILE UCARP_VIRTUALADDRESS UCARP_UPSCRIPT - UCARP_DOWNSCRIPT UCARP_VIRTUALPREFIX' - - local config_var='' - for config_var in $required_vars; do - if test -z "$(eval echo \$$config_var)"; then - eerror "Missing or empty config variable '$config_var'" - ewarn "You have to edit /etc/conf.d/${SVCNAME} first" - return 1 - fi - done -} - -logstatus() { - ebegin "Logging status of ${SVCNAME} to syslog" - start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}" - eend $? -} - -demote() { - ebegin "Demote ${SVCNAME} from master to backup" - start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}" - eend $? -} diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild index 34b627cabd74..ecdc7b997711 100644 --- a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild +++ b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz" LICENSE="Artistic GPL-2" SLOT="0" -KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="virtual/perl-ExtUtils-MakeMaker" diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 21a86de26586..212bbe12577b 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,3 +1,2 @@ -DIST youtube-dl-2021.01.03.tar.gz 3258305 BLAKE2B faebd2ad58b434b6c34d8ede40f5b095acfa123db306881dce4b78f7d144bd76de7d45cc248ad09bcfe86b5930db6a8f69fbdaca5b62b4942ce6c6b004c791f1 SHA512 2698e91bb176e79c3c8d621e835f58523099b7d2b3aea33df01c6f692ce68b02df12884dc276111e53296db2f284f7ac24603302e35f4e10852a1ec9ec9abd18 -DIST youtube-dl-2021.01.08.tar.gz 3270591 BLAKE2B 7be0b80a80943360ed0b3385921bc4a42c9d5cbb92d5d11f159c0b374a0c86798b14f635e8d31c16aa690f736a14d6c11369b10e42722fd7b5b7a5fdca182196 SHA512 516c5ac6e0e4513e574771a9d39f643f077e18b408dc7b709b92ca99d2d72f15719b545d5f7598a3a1d5eaeae52efff283c42001ce8c846c019582490be8cac1 DIST youtube-dl-2021.01.16.tar.gz 3275243 BLAKE2B 970bfff5db0aca7e386027e20f2b4d7e6b7209037820f3e0960f2e19b3b8e0aaf0f62bacb1794a15f359108533cbc396dddea99c84a8c88c13891329d2685326 SHA512 01b73f2e626df69249057ddc205d49dc7d6d16c66f4349fcdde5990615d1d13e0b5db15d65fb35e0c1328f7dc67d1473183228778614ccb7a3c9d27e80a0a38d +DIST youtube-dl-2021.01.24.1.tar.gz 3288395 BLAKE2B f0adc4ed7627cfda3b7729afd0e4617c1d78b44b5cb84186251eacdfb54bdd0ad2395253899a1aed1ba708856e872ca0537baf316f08b289140bdacb3976e9d6 SHA512 b5ab1e03f38b5628487fdfa22febd594f87d42c228fcc0b03966205ca3fbc6fa6103388f8736ad22e7d517359823d8ca6cc61aeb80fdd69db06a82d55437bacb diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild deleted file mode 100644 index 14a7b8632e94..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S=${WORKDIR}/${PN} - -LICENSE="public-domain" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -SLOT="0" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] -" - -distutils_enable_tests nose - -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} - -python_test() { - emake offlinetest -} - -python_install_all() { - doman youtube-dl.1 - - newbashcomp youtube-dl.bash-completion youtube-dl - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "youtube-dl works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. youtube-dl will detect whether" - elog "ffmpeg is present and automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want youtube-dl 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-2021.01.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild index d48e5503df65..14a7b8632e94 100644 --- a/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" S=${WORKDIR}/${PN} LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" SLOT="0" RDEPEND=" diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild index d48e5503df65..d48e5503df65 100644 --- a/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 68043e5890ba..3708673b2922 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,2 +1,2 @@ -DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4 DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189 +DIST zerotier-1.6.2.tar.gz 16020599 BLAKE2B 91da6c85f8d3dfd993a9aea9cd2a8b33e560d5475413fde8bef0a69df7d89503a66b1967ac336bd2213f6ffc35e452f665d37ceb8d9ae53cf5e5d4d352775e74 SHA512 8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643 diff --git a/net-misc/zerotier/files/zerotier.init-r1 b/net-misc/zerotier/files/zerotier.init-r1 new file mode 100644 index 000000000000..ee3097b58690 --- /dev/null +++ b/net-misc/zerotier/files/zerotier.init-r1 @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="ZeroTier - Global Area Networking" +pidfile="/run/${SVCNAME}.pid" +command="/usr/sbin/zerotier-one" +command_background=true + +depend() { + use net +} diff --git a/net-misc/zerotier/zerotier-1.2.12.ebuild b/net-misc/zerotier/zerotier-1.2.12.ebuild deleted file mode 100644 index 6f5351d0790d..000000000000 --- a/net-misc/zerotier/zerotier-1.2.12.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic systemd toolchain-funcs - -HOMEPAGE="https://www.zerotier.com/" -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -S="${WORKDIR}/ZeroTierOne-${PV}" - -RDEPEND=" - dev-libs/json-glib:= - net-libs/http-parser:= - net-libs/libnatpmp:= - net-libs/miniupnpc:=" - -DEPEND="${RDEPEND}" - -DOCS=( README.md AUTHORS.md ) - -src_compile() { - append-ldflags -Wl,-z,noexecstack - emake CXX="$(tc-getCXX)" STRIP=: one -} - -src_test() { - emake selftest - ./zerotier-selftest || die -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}".init "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - doman doc/zerotier-{cli.1,idtool.1,one.8} -} diff --git a/net-misc/zerotier/zerotier-1.6.2.ebuild b/net-misc/zerotier/zerotier-1.6.2.ebuild new file mode 100644 index 000000000000..fdfc4d61007e --- /dev/null +++ b/net-misc/zerotier/zerotier-1.6.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic llvm systemd toolchain-funcs + +HOMEPAGE="https://www.zerotier.com/" +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="clang neon" + +S="${WORKDIR}/ZeroTierOne-${PV}" + +RDEPEND=" + dev-libs/json-glib + net-libs/libnatpmp + net-libs/miniupnpc:= + clang? ( >=sys-devel/clang-6:* )" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch" + "${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch" +) + +DOCS=( README.md AUTHORS.md ) + +LLVM_MAX_SLOT=11 + +llvm_check_deps() { + if use clang ; then + if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then + ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + einfo "Will use LLVM slot ${LLVM_SLOT}!" + fi +} + +pkg_setup() { + if use clang && ! tc-is-clang ; then + export CC=${CHOST}-clang + export CXX=${CHOST}-clang++ + else + tc-export CXX CC + fi + use neon || export ZT_DISABLE_NEON=1 +} + +src_compile() { + append-ldflags -Wl,-z,noexecstack + emake CXX="${CXX}" STRIP=: one +} + +src_test() { + emake selftest + ./zerotier-selftest || die +} + +src_install() { + default + # remove pre-zipped man pages + rm "${ED}"/usr/share/man/{man1,man8}/* || die + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + doman doc/zerotier-{cli.1,idtool.1,one.8} +} |