[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/files/

2023-12-24 Thread Conrad Kostecki
commit: bc2a202423d669fd544ae94f275d672151d07401
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Dec 19 18:50:46 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 24 23:00:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2a2024

net-nntp/tin: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34372
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../tin/files/tin-2.6.1-configure-clang16.patch| 108 -
 1 file changed, 108 deletions(-)

diff --git a/net-nntp/tin/files/tin-2.6.1-configure-clang16.patch 
b/net-nntp/tin/files/tin-2.6.1-configure-clang16.patch
deleted file mode 100644
index 30fb937a6247..
--- a/net-nntp/tin/files/tin-2.6.1-configure-clang16.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-https://src.fedoraproject.org/rpms/tin/blob/bbfb5a569a97cde8d4ca95f44979070ad2f57bd0/f/tin-configure-c99.patch
-
-Add missing #include directives to pick up additional prototypes.
-Improves C99 compatibility.
-
 a/aclocal.m4
-+++ b/aclocal.m4
-@@ -2165,8 +2165,17 @@ AC_MSG_CHECKING([if application can dump core])
- AC_CACHE_VAL(cf_cv_corefile,[
-   AC_TRY_RUN([
- #include 
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
- #include 
- #include 
-+#ifdef HAVE_SYS_WAIT_H
-+#include 
-+#endif
-+#ifdef HAVE_UNISTD_H
-+#include 
-+#endif
- int found()
- {
-   struct stat sb;
-@@ -3319,6 +3328,9 @@ AC_DEFUN([CF_FUNC_FORK],
- [AC_MSG_CHECKING([for fork])
- AC_CACHE_VAL(cf_cv_func_fork,[
- AC_TRY_RUN([
-+#ifdef HAVE_UNISTD_H
-+#include 
-+#endif
- int main()
- {
-   if (fork() < 0)
-@@ -3465,6 +3477,9 @@ AC_MSG_CHECKING(if the system function returns usable 
child-status)
- AC_CACHE_VAL(cf_cv_system_status,[
-   AC_TRY_RUN([
- #include 
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
- #include 
- #if HAVE_SYS_WAIT_H
- #include 
-@@ -3495,7 +3510,11 @@ int main()
- ],
-   [cf_cv_system_status=no],
-   [AC_TRY_RUN(
--  [int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 
8)); }],
-+  [
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
-+int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); }],
-   [cf_cv_system_status=yes],
-   [cf_cv_system_status=unknown],
-   [cf_cv_system_status=unknown])],
 a/configure
-+++ b/configure
-@@ -26361,6 +26361,9 @@ else
- #line 26361 "configure"
- #include "confdefs.h"
- 
-+#ifdef HAVE_UNISTD_H
-+#include 
-+#endif
- int main()
- {
-   if (fork() < 0)
-@@ -27366,6 +27369,9 @@ else
- #include "confdefs.h"
- 
- #include 
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
- #include 
- #if HAVE_SYS_WAIT_H
- #include 
-@@ -27417,6 +27423,9 @@ else
-   cat >"conftest.$ac_ext" <<_ACEOF
- #line 27418 "configure"
- #include "confdefs.h"
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
- int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); }
- _ACEOF
- rm -f "conftest$ac_exeext"
-@@ -27764,8 +27773,17 @@ else
- #include "confdefs.h"
- 
- #include 
-+#ifdef HAVE_STDLIB_H
-+#include 
-+#endif
- #include 
- #include 
-+#ifdef HAVE_SYS_WAIT_H
-+#include 
-+#endif
-+#ifdef HAVE_UNISTD_H
-+#include 
-+#endif
- int found()
- {
-   struct stat sb;



[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/files/, net-nntp/tin/

2023-01-14 Thread Joonas Niilola
commit: 30f732b0c78067ac47867139ed9416308b57d858
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Sat Jan 14 18:04:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 14 18:05:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f732b0

net-nntp/tin: add 2.6.2

In this update:
* New: NNTPS support with different backends (openssl by default)
* New: PCRE2 support (enabled by default)
* Enable local news support
* Add missing virtual/libiconv dependency
* Add missing sys-devel/gettext bdep
* Drop net-mail/metamail optfeature dep (treecleaned)
* Export BUILD_* variables

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-nntp/tin/Manifest |   1 +
 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 ++
 4 files changed, 163 insertions(+), 8 deletions(-)

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9bf5..a1a8f0c73e92 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1 +1,2 @@
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B 
ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435
 SHA512 
dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
+DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 
0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2
 SHA512 
4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1

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 ..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 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-
-
-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 ..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{