[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/, net-nntp/tin/files/
commit: 337fb51a0fa6a491ef4f808887f1ffab82c17612 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 09:28:27 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 09:30:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337fb51a net-nntp/tin: fix modern C issue(s) Closes: https://bugs.gentoo.org/900278 Signed-off-by: Sam James gentoo.org> net-nntp/tin/files/tin-2.6.2-c99.patch | 93 net-nntp/tin/tin-2.6.2-r2.ebuild | 127 + 2 files changed, 220 insertions(+) diff --git a/net-nntp/tin/files/tin-2.6.2-c99.patch b/net-nntp/tin/files/tin-2.6.2-c99.patch new file mode 100644 index ..f9c9cff697f1 --- /dev/null +++ b/net-nntp/tin/files/tin-2.6.2-c99.patch @@ -0,0 +1,93 @@ +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/tin-2.6.2-r2.ebuild b/net-nntp/tin/tin-2.6.2-r2.ebuild new file mode 100644 index ..9eb463615776 --- /dev/null +++ b/net-nntp/tin/tin-2.6.2-r2.ebuild @@ -0,0 +1,127 @@ +# 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? ( + libtl
[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/, net-nntp/tin/files/
commit: 24835e8c32ec077db8f49f972e6d83ce593eeed1 Author: Sam James gentoo org> AuthorDate: Wed Jan 4 03:42:58 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jan 4 04:31:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24835e8c net-nntp/tin: fix configure w/ clang 16 Signed-off-by: Sam James gentoo.org> .../tin/files/tin-2.6.1-configure-clang16.patch| 108 + .../tin/{tin-2.6.1.ebuild => tin-2.6.1-r1.ebuild} | 14 +-- 2 files changed, 116 insertions(+), 6 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 new file mode 100644 index ..30fb937a6247 --- /dev/null +++ b/net-nntp/tin/files/tin-2.6.1-configure-clang16.patch @@ -0,0 +1,108 @@ +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; diff --git a/net-nntp/tin/tin-2.6.1.ebuild b/net-nntp/tin/tin-2.6.1-r1.ebuild similarity index 90% rename from net-nntp/tin/tin-2.6.1.ebuild rename to net-nntp/tin/tin-2.6.1-r1.ebuild index 9a5e6df36f8c..cc1eac16cc3e 100644 --- a/net-nntp/tin/tin-2.6.1.ebuild +++ b/net-nntp/tin/tin-2.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,10 +36,14 @@ DOCS=( doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} ) +PATCHES=( + "${FILESDIR}"/${PN}-2.6.1-configure-clang16.patch +) + src_configure() { tc-export AR CC RANLIB - econf_args=( + local myeconfargs=( $(use_enable cancel-locks) $(use_with cancel-locks canlock) $(use_enable debug) $(use_enable gpg pgp-gpg) @@ -52,10 +56,8 @@ src_configure() { --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}" --with-pcre=/usr --with-screen=ncursesw - ) - # set default paths for utilities - econf_args+=( + # set default paths for utilities --with-editor="${EPREFIX}"/usr/libexec/editor --with-gpg="${EPREFIX}"/usr/bin/gpg --with-ispell="${EPREFIX}"/usr/bin/aspell @@ -64,7 +66,7 @@ src_configure() { --with-sum="${EPREFIX}"/usr/bin/sum ) - econf "${econf_args[@]}" + econf "${myeconfargs[@]}" } src_compile() {