From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- net-im/pidgin/Manifest | 3 +- .../files/pidgin-2.13.0-gnutls_sni_support.patch | 33 +++ net-im/pidgin/pidgin-2.13.0-r5.ebuild | 280 -------------------- net-im/pidgin/pidgin-2.13.0-r6.ebuild | 281 +++++++++++++++++++++ 4 files changed, 316 insertions(+), 281 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch delete mode 100644 net-im/pidgin/pidgin-2.13.0-r5.ebuild create mode 100644 net-im/pidgin/pidgin-2.13.0-r6.ebuild (limited to 'net-im/pidgin') diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index b36360c10dea..3a28248c32f8 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -3,9 +3,10 @@ AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993 +AUX pidgin-2.13.0-gnutls_sni_support.patch 1298 BLAKE2B 1bf2be33e4328d5e52256ced4ee53a4ba7b4a294e7a8f47833950019dfae654c37f1b7dc63d6fe4b1d3f7b4e35fe3a1fc8d527a72660f43b9f16f2f218d491ee SHA512 ebdc088aeec3064e98e5f033f67eefa6c5a38cd074aa04d1bbd1db2738e932326a2abcddb27bd4b4a92bfde84811fec3517d4965cb215bd035762c4f1d006d8a AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f0662823888a7f844fc1f6f7b498755c447ee78cffc9bbafb7f7c531710d3045795517825257f2786f0c999829656d469bd835adb SHA512 3ae82355321c59b0c4afa916e5c27ff0d2df95951ba363c67fada5634bf5673c2ded01515a3b927f1c6020c5f56d19279e6a7e9715ce766013ad763c4e61652b DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 -EBUILD pidgin-2.13.0-r5.ebuild 7801 BLAKE2B b4734f51179dcfb60b5faf5d1305317f43efcbd4e7ef699ca41a6cd6f627cda9ae3e80f397194e3b76488c967723b1666dac0da699ee82edb0423bb043109115 SHA512 b4119884ad72dd99af7eab62a15f576630662888f98327ae67c8e0e99ee9a1125d3e63bc7a263d1070712a6a1edc6545ea2d309ad180d0d4a570141d8f738ca8 +EBUILD pidgin-2.13.0-r6.ebuild 7862 BLAKE2B 105e3f6c3cda1bf56e25b9eebedd47cbb765b1a73f17d94ce7751c0f1527d4ad62ad09d78328d378c66a3734a2c82c0f1877878e17e4070f38de4b88d3d32434 SHA512 b83b2ea8323a526afc623f16b3bd1a47c5533dd18111331b161d5bfe999c2ca9c19deabfc814acdb9f27f61bd7cd9e4d5e3c81ef0a743e4b3b832d889fbd9340 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7 diff --git a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch new file mode 100644 index 000000000000..df6b8e5cd030 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User Mihai Moldovan +# Date 1576498301 -3600 +# Branch release-2.x.y +# Node ID 6dba8046e1b120c506e1d911c6aa8757d7774c57 +# Parent 7a975763d3b64bdd8dd5371d711a4add647ed726 +Implement SNI support for the gnutls SSL plugin. + +Note that gnutls is picky in regard to what it accepts as the server name - it +MUST be a domain name. IP addresses are not supported according to the +documentation. + +Hence, filter out IP addresses and hope that whatever is not recognized as +such an address is actually a domain name. This will probably fail for more +exotic addresses (especially in IPv6 realm), but wiring up a full-blown parser +is too much effort and SSL plugins are not part of purple-3 anyway. + +Fixes #17300 + +diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c +--- a/libpurple/plugins/ssl/ssl-gnutls.c ++++ b/libpurple/plugins/ssl/ssl-gnutls.c +@@ -403,6 +403,10 @@ + + gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd)); + ++ /* SNI support. */ ++ if (gsc->host && !g_hostname_is_ip_address(gsc->host)) ++ gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host)); ++ + gnutls_data->handshake_handler = purple_input_add(gsc->fd, + PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc); + diff --git a/net-im/pidgin/pidgin-2.13.0-r5.ebuild b/net-im/pidgin/pidgin-2.13.0-r5.ebuild deleted file mode 100644 index b6fa6ecd0772..000000000000 --- a/net-im/pidgin/pidgin-2.13.0-r5.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{6,7} ) - -inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://pidgin.im/" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2 - https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" - -LICENSE="GPL-2" -SLOT="0/2" # libpurple version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn -meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl -tk +xscreensaver zephyr zeroconf" # mono - -# dbus requires python to generate C code for dbus bindings (thus DEPEND only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is -# no way to build dbus and avoid libgnt linkage with python. If you want this -# send patch upstream. -# purple-url-handler and purple-remote require dbus-python thus in reality we -# rdepend on python if dbus enabled. But it is possible to separate this dep. -RDEPEND=" - >=dev-libs/glib-2.16 - >=dev-libs/libxml2-2.6.18 - ncurses? ( - sys-libs/ncurses:0=[unicode] - dbus? ( ${PYTHON_DEPS} ) - python? ( ${PYTHON_DEPS} ) - ) - gtk? ( - >=x11-libs/gtk+-2.10:2[aqua=] - x11-libs/libSM - >=x11-libs/pango-1.4.0 - xscreensaver? ( x11-libs/libXScrnSaver ) - spell? ( >=app-text/gtkspell-2.0.2:2 ) - eds? ( >=gnome-extra/evolution-data-server-3.6:= ) - prediction? ( >=dev-db/sqlite-3.3:3 ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=net-libs/farstream-0.2.7:0.2 - ) - zeroconf? ( net-dns/avahi[dbus] ) - dbus? ( - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-0.90 - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - ') - ) - perl? ( >=dev-lang/perl-5.16:= ) - gadu? ( || ( - >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] - >=net-libs/libgadu-1.11.0[-ssl] - ) ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/nspr - dev-libs/nss - ) - meanwhile? ( net-libs/meanwhile ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn:= ) - ! python is enabled - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" - if use gtk && ! use nls ; then - ewarn "gtk build => nls is enabled!" - fi - if use dbus && ! use python ; then - elog "dbus is enabled, no way to disable linkage with python => python is enabled" - fi -} - -pkg_setup() { - if use python || use dbus ; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - use pie && append-cflags -fPIE -pie - - use gadu && DYNAMIC_PRPLS+=",gg" - use groupwise && DYNAMIC_PRPLS+=",novell" - use meanwhile && DYNAMIC_PRPLS+=",sametime" - use zephyr && DYNAMIC_PRPLS+=",zephyr" - use zeroconf && DYNAMIC_PRPLS+=",bonjour" - - local myconf=( - --disable-mono - --with-dynamic-prpls="${DYNAMIC_PRPLS}" - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" - --x-includes="${EPREFIX}"/usr/include/X11 - $(use_enable ncurses consoleui) - $(use_enable gtk gtkui) - $(use_enable gtk sm) - $(usex gtk '--enable-nls' "$(use_enable nls)") - $(use gtk && use_enable xscreensaver screensaver) - $(use gtk && use_enable prediction cap) - $(use gtk && use_enable eds gevolution) - $(use gtk && use_enable spell gtkspell) - $(use_enable perl) - $(use_enable tk) - $(use_enable tcl) - $(use_enable debug) - $(use_enable dbus) - $(use_enable meanwhile) - $(use_enable gstreamer) - $(use_with gstreamer gstreamer 1.0) - $(use_enable gstreamer farstream) - $(use_enable gstreamer vv) - $(use_enable sasl cyrus-sasl ) - $(use_enable doc doxygen) - $(use_enable networkmanager nm) - $(use_enable zeroconf avahi) - $(use_enable idn) - ) - - if use gnutls; then - einfo "Disabling NSS, using GnuTLS" - myconf+=( --enable-nss=no --enable-gnutls=yes ) - myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" ) - myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" ) - else - einfo "Disabling GnuTLS, using NSS" - myconf+=( --enable-gnutls=no --enable-nss=yes ) - fi - - if use dbus || { use ncurses && use python ; } ; then - myconf+=( --with-python=${PYTHON} ) - else - myconf+=( --without-python ) - fi - - econf "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - if use gtk ; then - # Fix tray paths for e16 (x11-wm/enlightenment) and other - # implementations that are not complient with new hicolor theme yet, #323355 - local pixmapdir - for d in 16 22 32 48; do - pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions - mkdir "${pixmapdir}" || die - pushd "${pixmapdir}" >/dev/null || die - for f in ../status/*; do - ln -s ${f} || die - done - popd >/dev/null || die - done - fi - use perl && perl_delete_localpod - - if use python && use dbus ; then - python_fix_shebang "${ED}" - python_optimize - fi - - dodoc ${DOCS} finch/plugins/pietray.py - docompress -x /usr/share/doc/${PF}/pietray.py - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} - -src_test() { - # make default build logs slightly more useful - emake check VERBOSE=1 -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-im/pidgin/pidgin-2.13.0-r6.ebuild b/net-im/pidgin/pidgin-2.13.0-r6.ebuild new file mode 100644 index 000000000000..aee1ccb0a4bf --- /dev/null +++ b/net-im/pidgin/pidgin-2.13.0-r6.ebuild @@ -0,0 +1,281 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{6,7} ) + +inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://pidgin.im/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2 + https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" + +LICENSE="GPL-2" +SLOT="0/2" # libpurple version +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn +meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl +tk +xscreensaver zephyr zeroconf" # mono + +# dbus requires python to generate C code for dbus bindings (thus DEPEND only). +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is +# no way to build dbus and avoid libgnt linkage with python. If you want this +# send patch upstream. +# purple-url-handler and purple-remote require dbus-python thus in reality we +# rdepend on python if dbus enabled. But it is possible to separate this dep. +RDEPEND=" + >=dev-libs/glib-2.16 + >=dev-libs/libxml2-2.6.18 + ncurses? ( + sys-libs/ncurses:0=[unicode] + dbus? ( ${PYTHON_DEPS} ) + python? ( ${PYTHON_DEPS} ) + ) + gtk? ( + >=x11-libs/gtk+-2.10:2[aqua=] + x11-libs/libSM + >=x11-libs/pango-1.4.0 + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=app-text/gtkspell-2.0.2:2 ) + eds? ( >=gnome-extra/evolution-data-server-3.6:= ) + prediction? ( >=dev-db/sqlite-3.3:3 ) + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=net-libs/farstream-0.2.7:0.2 + ) + zeroconf? ( net-dns/avahi[dbus] ) + dbus? ( + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-0.90 + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] + ') + ) + perl? ( >=dev-lang/perl-5.16:= ) + gadu? ( || ( + >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] + >=net-libs/libgadu-1.11.0[-ssl] + ) ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/nspr + dev-libs/nss + ) + meanwhile? ( net-libs/meanwhile ) + tcl? ( dev-lang/tcl:0= ) + tk? ( dev-lang/tk:0= ) + sasl? ( dev-libs/cyrus-sasl:2 ) + networkmanager? ( net-misc/networkmanager ) + idn? ( net-dns/libidn:= ) + ! python is enabled + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls ; then + ewarn "gtk build => nls is enabled!" + fi + if use dbus && ! use python ; then + elog "dbus is enabled, no way to disable linkage with python => python is enabled" + fi +} + +pkg_setup() { + if use python || use dbus ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Stabilize things, for your own good + strip-flags + replace-flags -O? -O2 + use pie && append-cflags -fPIE -pie + + use gadu && DYNAMIC_PRPLS+=",gg" + use groupwise && DYNAMIC_PRPLS+=",novell" + use meanwhile && DYNAMIC_PRPLS+=",sametime" + use zephyr && DYNAMIC_PRPLS+=",zephyr" + use zeroconf && DYNAMIC_PRPLS+=",bonjour" + + local myconf=( + --disable-mono + --with-dynamic-prpls="${DYNAMIC_PRPLS}" + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" + --x-includes="${EPREFIX}"/usr/include/X11 + $(use_enable ncurses consoleui) + $(use_enable gtk gtkui) + $(use_enable gtk sm) + $(usex gtk '--enable-nls' "$(use_enable nls)") + $(use gtk && use_enable xscreensaver screensaver) + $(use gtk && use_enable prediction cap) + $(use gtk && use_enable eds gevolution) + $(use gtk && use_enable spell gtkspell) + $(use_enable perl) + $(use_enable tk) + $(use_enable tcl) + $(use_enable debug) + $(use_enable dbus) + $(use_enable meanwhile) + $(use_enable gstreamer) + $(use_with gstreamer gstreamer 1.0) + $(use_enable gstreamer farstream) + $(use_enable gstreamer vv) + $(use_enable sasl cyrus-sasl ) + $(use_enable doc doxygen) + $(use_enable networkmanager nm) + $(use_enable zeroconf avahi) + $(use_enable idn) + ) + + if use gnutls; then + einfo "Disabling NSS, using GnuTLS" + myconf+=( --enable-nss=no --enable-gnutls=yes ) + myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" ) + myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" ) + else + einfo "Disabling GnuTLS, using NSS" + myconf+=( --enable-gnutls=no --enable-nss=yes ) + fi + + if use dbus || { use ncurses && use python ; } ; then + myconf+=( --with-python=${PYTHON} ) + else + myconf+=( --without-python ) + fi + + econf "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + if use gtk ; then + # Fix tray paths for e16 (x11-wm/enlightenment) and other + # implementations that are not complient with new hicolor theme yet, #323355 + local pixmapdir + for d in 16 22 32 48; do + pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions + mkdir "${pixmapdir}" || die + pushd "${pixmapdir}" >/dev/null || die + for f in ../status/*; do + ln -s ${f} || die + done + popd >/dev/null || die + done + fi + use perl && perl_delete_localpod + + if use python && use dbus ; then + python_fix_shebang "${ED}" + python_optimize + fi + + dodoc ${DOCS} finch/plugins/pietray.py + docompress -x /usr/share/doc/${PF}/pietray.py + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} + +src_test() { + # make default build logs slightly more useful + emake check VERBOSE=1 +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} -- cgit v1.2.3