From 3bd85407abc9ed4434c2d3741f84fdb512638b1c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jan 2023 23:53:26 +0000 Subject: gentoo auto-resync : 14:01:2023 - 23:53:26 --- net-nntp/Manifest.gz | Bin 1372 -> 1371 bytes net-nntp/tin/Manifest | 5 +- net-nntp/tin/files/tin-2.6.2-gnutls.patch | 36 ++++++++++ net-nntp/tin/metadata.xml | 18 ++--- net-nntp/tin/tin-2.6.2.ebuild | 116 ++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 9 deletions(-) create mode 100644 net-nntp/tin/files/tin-2.6.2-gnutls.patch create mode 100644 net-nntp/tin/tin-2.6.2.ebuild (limited to 'net-nntp') diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz index b35bae7d7133..81767487cf2b 100644 Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest index 87a283f4575e..c37c52694f79 100644 --- a/net-nntp/tin/Manifest +++ b/net-nntp/tin/Manifest @@ -1,4 +1,7 @@ AUX tin-2.6.1-configure-clang16.patch 2473 BLAKE2B af55c171def1e2756bdb305069aeb81b79198397afb38738c4298a1268dc813f7a9c11b941da503d11d5b2d4bac48cb5fa987486dc42a833b1d8241e05779542 SHA512 56ff3b3e71f79145feeaa6e6ce20bf2ebdc3f4b02681423dcabf27ccaa69ffeecb85430b2aed6c07bb9c90fffcaba35801dd44f4e8a81d0fd6fd698cea010af1 +AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f12517aed07298aaa54dc85a26aa28f4a091841fd2efa154b9acc4fa7749d575ec3aba60e4008f9c1ef533a50120 SHA512 d372ce615a18ab5cc67ec69e71870e5073937e8a59f55cf7e5a43271cd9eb55ae379e875b8656b2140403e23792df1844b05ff234cbed18883f59a445d11d21f DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3 +DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1 EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde -MISC metadata.xml 408 BLAKE2B a89a2128685a8dc089ba37438352ae8c7171b74c90a8f838a5b7d930b142a90e6d69672ec4ec3f4e97e71c6b38ef9daf988bd5b46d6ccc9f3e4aa0f173075679 SHA512 26855098ca6c2da9fa4edf5620be29402f3c854280e3ca1b26a43af9d630ca34d229a34cc7b513c20c0a03c9e500830fc586f0086668042cff645d08741306b3 +EBUILD tin-2.6.2.ebuild 2616 BLAKE2B 1a413554c21c265ff5788cbc803a8d93c1dbabfd5bb80bcce80b8bff9225c63a5382c8a47ec6793065af57ae3de2dafb0520325a6e47c6acce00ef999dd906b9 SHA512 7200bc8e81eaa2414274db129b0d873601d92dd5c476462f5e61efe508660ace7a1b1f0b824119733d2d43a4578902825f61d19cdab50cd58b8151015fcd3d18 +MISC metadata.xml 702 BLAKE2B e49603687a5cf71915d5228e4ecb37b2d14adaebdc7e77d6ccde3fead607e40a722e72423712d38194e14af5e4e429598c1bd7e52242688c6f746a983bc4d7f2 SHA512 cb7e2a8b53bdbb06270daf300fac3af347bdfa40049966e75b7e18db4157569dafc50a1c5abb3367a0103718c26e703b3245b5076686df81ec9727338ce42491 diff --git a/net-nntp/tin/files/tin-2.6.2-gnutls.patch b/net-nntp/tin/files/tin-2.6.2-gnutls.patch new file mode 100644 index 000000000000..b7f7de0956a2 --- /dev/null +++ b/net-nntp/tin/files/tin-2.6.2-gnutls.patch @@ -0,0 +1,36 @@ +Upstream patch to allow GnuTLS support without debug definitions. + +--- a/src/nntps.c ++++ b/src/nntps.c +@@ -41,8 +41,8 @@ + #endif /* USE_LIBTLS */ + + #ifdef USE_GNUTLS +-# ifdef DEBUG + static int verification_func(gnutls_session_t session); ++# ifdef DEBUG + static void log_func(int level, const char *msg); + # endif /* DEBUG */ + #else +@@ -933,8 +933,7 @@ + #endif /* USE_OPENSSL */ + + +-#ifdef DEBUG +-# ifdef USE_GNUTLS ++#ifdef USE_GNUTLS + static int + verification_func( + gnutls_session_t session) +@@ -953,8 +952,11 @@ + + return gnutls_verification_status; + } ++#endif /* USE_GNUTLS */ + + ++#ifdef DEBUG ++# ifdef USE_GNUTLS + static void + log_func( + int level, diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml index e9e3c1ae47e8..2273dcd0ef5a 100644 --- a/net-nntp/tin/metadata.xml +++ b/net-nntp/tin/metadata.xml @@ -1,12 +1,14 @@ - - -http://www.tin.org/bin/man.cgi?section=1&topic=tin - - -Enable Cancel-Lock header functionality -Enable app-crypt/gnupg support - + + + http://www.tin.org/bin/man.cgi?section=1&topic=tin + + + Enable Cancel-Lock header functionality + Enable app-crypt/gnupg support + Prefer dev-libs/libretls as SSL/TLS provider (ineffective with USE=-ssl) + Use dev-libs/libpcre2 instead of dev-libs/libpcre + diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2.ebuild new file mode 100644 index 000000000000..50345f36be9e --- /dev/null +++ b/net-nntp/tin/tin-2.6.2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs + +DESCRIPTION="A threaded NNTP and spool based UseNet newsreader" +HOMEPAGE="http://www.tin.org/" +SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl" + +RDEPEND=" + dev-libs/icu:= + dev-libs/uulib + sys-libs/ncurses:= + virtual/libiconv + cancel-locks? ( >=net-libs/canlock-3.0:= ) + gpg? ( app-crypt/gnupg ) + nls? ( virtual/libintl ) + pcre2? ( dev-libs/libpcre2:= ) + !pcre2? ( dev-libs/libpcre:3 ) + sasl? ( virtual/gsasl ) + socks5? ( net-proxy/dante ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + libtls? ( dev-libs/libretls:= ) + !libtls? ( dev-libs/openssl:= ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( "${FILESDIR}"/${P}-gnutls.patch ) + +DOCS=( + README{,.MAC,.WIN} + doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} +) + +src_configure() { + tc-export AR CC RANLIB + tc-export_build_env + + local myeconfargs=( + $(use_enable cancel-locks) + $(use_with cancel-locks canlock) + + $(use_with pcre2 pcre2-config) + $(use_with !pcre2 pcre "${ESYSROOT}"/usr) + + $(use_enable debug) + $(use_enable gpg pgp-gpg) + $(use_enable nls) + $(use_with socks5 socks) + --disable-mime-strict-charset + --enable-nntp + --enable-prototypes + --with-coffee # easter egg :) + --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}" + --with-screen=ncursesw + ) + + if use ssl; then + if use gnutls; then + myeconfargs+=( --with-nntps=gnutls ) + elif use libtls; then + myeconfargs+=( --with-nntps=libtls ) + else + myeconfargs+=( --with-nntps=openssl ) + fi + fi + + myeconfargs+=( + # set default paths for utilities + --with-editor="${EPREFIX}"/usr/libexec/editor + --with-gpg="${EPREFIX}"/usr/bin/gpg + --with-ispell="${EPREFIX}"/usr/bin/aspell + --with-mailer="${EPREFIX}"/bin/mail + --with-sum="${EPREFIX}"/usr/bin/sum + + # set default paths for directories + --with-libdir="${EPREFIX}"/var/lib/news + --with-spooldir="${EPREFIX}"/var/spool/news + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # To build from the root dir you have to call `make build`, not just `make`. + emake build +} + +src_install() { + default + + emake DESTDIR="${D}" install_sysdefs + emake -C src DESTDIR="${D}" install_nls_man + + dodoc doc/{*.sample,*.txt} +} + +pkg_postinst() { + optfeature "spell checker support" app-text/aspell +} -- cgit v1.2.3