From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 021D71582EF for ; Sun, 02 Mar 2025 13:28:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E1AD8343102 for ; Sun, 02 Mar 2025 13:28:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2D5591102D2; Sun, 02 Mar 2025 13:28:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 291291102D2 for ; Sun, 02 Mar 2025 13:28:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5EB53430F4 for ; Sun, 02 Mar 2025 13:28:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 323FE280A for ; Sun, 02 Mar 2025 13:28:22 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1740922061.90210cb8c34f0a77e271d76c9378b9a9595e784a.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/, net-nntp/tin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nntp/tin/Manifest net-nntp/tin/files/tin-2.6.2-c99.patch net-nntp/tin/files/tin-2.6.2-gnutls.patch net-nntp/tin/tin-2.6.2-r1.ebuild net-nntp/tin/tin-2.6.2-r2.ebuild X-VCS-Directories: net-nntp/tin/ net-nntp/tin/files/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: 90210cb8c34f0a77e271d76c9378b9a9595e784a X-VCS-Branch: master Date: Sun, 02 Mar 2025 13:28:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f85f65f1-239e-423a-93e2-d06cade4d902 X-Archives-Hash: c32125518d574947cdfddea6fa55fa9b commit: 90210cb8c34f0a77e271d76c9378b9a9595e784a Author: Petr Vaněk gentoo org> AuthorDate: Sun Mar 2 13:26:35 2025 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Sun Mar 2 13:27:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90210cb8 net-nntp/tin: drop 2.6.2-r1, 2.6.2-r2 Bug: https://bugs.gentoo.org/931613 Signed-off-by: Petr Vaněk gentoo.org> net-nntp/tin/Manifest | 1 - net-nntp/tin/files/tin-2.6.2-c99.patch | 93 ---------------------- net-nntp/tin/files/tin-2.6.2-gnutls.patch | 36 --------- net-nntp/tin/tin-2.6.2-r1.ebuild | 120 ---------------------------- net-nntp/tin/tin-2.6.2-r2.ebuild | 127 ------------------------------ 5 files changed, 377 deletions(-) diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest index f5634f1174e9..32f4f5be264f 100644 --- a/net-nntp/tin/Manifest +++ b/net-nntp/tin/Manifest @@ -1,3 +1,2 @@ -DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1 DIST tin-2.6.3.tar.xz 1639192 BLAKE2B dba26c5e5fe0e331e069a22ce3241c00e7e01f582d00a38e55e2fe33c93f98d99c47e9d04e0660b40535a8b11e63789bc91df1b22dacd62405ee716a003c07dd SHA512 e8b474849e3330475e92b7c578ffe2f29f022303be266d39493e58b7227d9a5ee3915812c1806f52358c07f91d6119810498db906d2da7ffe035feba0e340a42 DIST tin-2.6.4.tar.xz 1640064 BLAKE2B 7a9ec66a55db282b2b3b7c977dfafd47cb72224873369ebbce05865a92719253f59a17d1b79fcee98c1c10a88e323eddcd88d40ea6719be96a407ed361aa4107 SHA512 63d7d8bf9d00644b05f128ab78960a1a1ccbeebbec9721517dc4971d07459d0a547adfd4eb8446a695d7303b43f45168a203c29f318b66fc79e4aba80cf8cc97 diff --git a/net-nntp/tin/files/tin-2.6.2-c99.patch b/net-nntp/tin/files/tin-2.6.2-c99.patch deleted file mode 100644 index f9c9cff697f1..000000000000 --- a/net-nntp/tin/files/tin-2.6.2-c99.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://src.fedoraproject.org/rpms/tin/c/1f724cd60f641c3599f65e819dd2a878efa6b1a2?branch=rawhide - -diff --git a/aclocal.m4 b/aclocal.m4 -index 2891764c68c773c4..5620aad356b67762 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -3517,7 +3517,7 @@ RETSIGTYPE signal_handler (int sig) - int system_status; - wait (&wait_status); - system_status = WEXITSTATUS(wait_status); /* should be nonzero */ -- ${cf_cv_main_return:-return}(system_status != 23); -+ exit(system_status != 23); - } - - int main(void) -@@ -5173,7 +5173,7 @@ AC_CACHE_CHECK([for passwd.pw_gecos], cf_cv_pw_gecos,[ - #include - ],[ - struct passwd foo; -- char bar = foo.pw_gecos], -+ char *bar = foo.pw_gecos], - [cf_cv_pw_gecos=yes], - [cf_cv_pw_gecos=no])]) - test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS,1,[Define this to 1 if passwd struct has .pw_gecos]) -diff --git a/configure b/configure -index 9e2d9ab4b6c46581..a85eaf929db2c820 100755 ---- a/configure -+++ b/configure -@@ -24209,7 +24209,8 @@ int - main (void) - { - -- int32_t needed, ustr = NULL; -+ int32_t needed; -+ const UChar *ustr = NULL; - UErrorCode status; - needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); - ; -@@ -26820,8 +26821,8 @@ cat >"conftest.$ac_ext" <<_ACEOF - int - main (void) - { --struct timeval *tv; --struct timezone *tz; -+struct timeval tv; -+struct timezone tz; - gettimeofday(&tv, &tz); - ; - return 0; -@@ -27669,7 +27670,7 @@ main (void) - { - - struct passwd foo; -- char bar = foo.pw_gecos -+ char *bar = foo.pw_gecos - ; - return 0; - } -@@ -28106,7 +28107,7 @@ RETSIGTYPE signal_handler (int sig) - int system_status; - wait (&wait_status); - system_status = WEXITSTATUS(wait_status); /* should be nonzero */ -- ${cf_cv_main_return:-return}(system_status != 23); -+ exit(system_status != 23); - } - - int main(void) -diff --git a/configure.in b/configure.in -index 7d24b24176f7c3a6..810eaf6158dc9b48 100644 ---- a/configure.in -+++ b/configure.in -@@ -1013,7 +1013,8 @@ AC_CHECK_HEADER(unicode/unorm.h,[ - cf_try_icuuc="no" - LIBS="$LIBS -licuuc" - AC_TRY_LINK([#include ], [ -- int32_t needed, ustr = NULL; -+ int32_t needed; -+ const UChar *ustr = NULL; - UErrorCode status; - needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [ - AC_DEFINE(HAVE_LIBICUUC,1,[Define this to 1 if we have libicuuc]) -@@ -1280,8 +1281,8 @@ AC_TRY_COMPILE([ - #if HAVE_SYS_TIME_H - #include - #endif], --[struct timeval *tv; --struct timezone *tz; -+[struct timeval tv; -+struct timezone tz; - gettimeofday(&tv, &tz);], - ac_cv_func_gettimeofday_2args=yes, ac_cv_func_gettimeofday_2args=no) - AC_MSG_RESULT($ac_cv_func_gettimeofday_2args) - diff --git a/net-nntp/tin/files/tin-2.6.2-gnutls.patch b/net-nntp/tin/files/tin-2.6.2-gnutls.patch deleted file mode 100644 index b7f7de0956a2..000000000000 --- a/net-nntp/tin/files/tin-2.6.2-gnutls.patch +++ /dev/null @@ -1,36 +0,0 @@ -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/tin-2.6.2-r1.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild deleted file mode 100644 index 631a6ec8091d..000000000000 --- a/net-nntp/tin/tin-2.6.2-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# 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 sasl socks5 ssl" - -RDEPEND=" - dev-libs/icu:= - dev-libs/libpcre2:= - dev-libs/uulib - sys-libs/ncurses:= - virtual/libiconv - cancel-locks? ( >=net-libs/canlock-3.0:= ) - gpg? ( app-crypt/gnupg ) - nls? ( virtual/libintl ) - 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 - dev-libs/libpcre2 - 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 - - # The build incorrectly discards its local -I if $CPPFLAGS is set. - if [[ -n ${BUILD_CPPFLAGS} ]]; then - BUILD_CPPFLAGS+=' -I$(INCDIR)' - fi - - local myeconfargs=( - $(use_enable cancel-locks) - $(use_with cancel-locks canlock) - - $(use_enable debug) - $(use_enable gpg pgp-gpg) - $(use_enable nls) - $(use_with socks5 socks) - --disable-mime-strict-charset - --enable-nntp - --enable-prototypes - --without-pcre - --with-pcre2-config - --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 -} diff --git a/net-nntp/tin/tin-2.6.2-r2.ebuild b/net-nntp/tin/tin-2.6.2-r2.ebuild deleted file mode 100644 index 9eb463615776..000000000000 --- a/net-nntp/tin/tin-2.6.2-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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 sasl socks5 ssl" - -RDEPEND=" - dev-libs/icu:= - dev-libs/libpcre2:= - dev-libs/uulib - sys-libs/ncurses:= - virtual/libiconv - cancel-locks? ( >=net-libs/canlock-3.0:= ) - gpg? ( app-crypt/gnupg ) - nls? ( virtual/libintl ) - sasl? ( net-misc/gsasl[client] ) - 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 ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - # Windows only (bug #900278) - memset_s -) - -PATCHES=( - "${FILESDIR}"/${P}-gnutls.patch - "${FILESDIR}"/${PN}-2.6.2-c99.patch -) - -DOCS=( - README{,.MAC,.WIN} - doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} -) - -src_configure() { - tc-export AR CC RANLIB - tc-export_build_env - - # The build incorrectly discards its local -I if $CPPFLAGS is set. - if [[ -n ${BUILD_CPPFLAGS} ]]; then - BUILD_CPPFLAGS+=' -I$(INCDIR)' - fi - - local myeconfargs=( - $(use_enable cancel-locks) - $(use_with cancel-locks canlock) - - $(use_enable debug) - $(use_enable gpg pgp-gpg) - $(use_enable nls) - $(use_with socks5 socks) - --disable-mime-strict-charset - --enable-nntp - --enable-prototypes - --without-pcre - --with-pcre2-config - --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 -}