* [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2
@ 2022-12-25 18:06 Anna Vyalkova
2023-01-12 10:32 ` [gentoo-proxy-maint] [PATCH v2] " Anna Vyalkova
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Anna Vyalkova @ 2022-12-25 18:06 UTC (permalink / raw
To: gentoo-proxy-maint
In this episode:
* New: NNTPS support with different backends (openssl by default)
* New: PCRE2 support (enabled by default)
* Add missing virtual/libiconv dependency
* Add missing sys-devel/gettext bdep
* Drop net-mail/metamail optfeature dep (pmasked)
* Export BUILD_* variables
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
net-nntp/tin/Manifest | 1 +
net-nntp/tin/metadata.xml | 19 +++---
net-nntp/tin/tin-2.6.2.ebuild | 106 ++++++++++++++++++++++++++++++++++
3 files changed, 118 insertions(+), 8 deletions(-)
create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9b..a1a8f0c73e 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/metadata.xml b/net-nntp/tin/metadata.xml
index e9e3c1ae47..22ce019d89 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+ <!-- maintainer-needed -->
+ <upstream>
+ <doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
+ </upstream>
+ <use>
+ <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+ <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+ <flag name="libtls" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="openssl" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/openssl</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="pcre2" restrict=">=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+ </use>
</pkgmetadata>
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 0000000000..065eeade08
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 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 +openssl +pcre2 sasl socks5 ssl"
+REQUIRED_USE="ssl? ( ^^ ( gnutls libtls openssl ) )"
+
+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:= )
+ libtls? ( dev-libs/libretls:= )
+ openssl? ( dev-libs/openssl:= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=(
+ README{,.MAC,.WIN}
+ doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
+)
+
+src_configure() {
+ tc-export AR CC RANLIB
+ tc-export_build_env
+
+ econf_args=(
+ $(use_enable cancel-locks) $(use_with cancel-locks canlock)
+ $(use_enable debug)
+ $(use_enable gpg pgp-gpg)
+ $(use_enable nls)
+ $(use_with pcre2 pcre2-config)
+ $(use_with !pcre2 pcre "${ESYSROOT}"/usr)
+ $(use_with socks5 socks) $(use_with socks5)
+ --disable-mime-strict-charset
+ --enable-nntp-only
+ --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
+ econf_args+=( --with-nntps=gnutls )
+ elif use libtls; then
+ econf_args+=( --with-nntps=libtls )
+ elif use openssl; then
+ econf_args+=( --with-nntps=openssl )
+ fi
+ fi
+
+ # set default paths for utilities
+ econf_args+=(
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-gpg="${EPREFIX}"/usr/bin/gpg
+ --with-ispell="${EPREFIX}"/usr/bin/aspell
+ --with-mailer="${EPREFIX}"/bin/mail
+ --with-metamail="${EPREFIX}"/usr/bin/metamail
+ --with-sum="${EPREFIX}"/usr/bin/sum
+ )
+
+ econf "${econf_args[@]}"
+}
+
+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
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-proxy-maint] [PATCH v2] net-nntp/tin: add 2.6.2
2022-12-25 18:06 [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2 Anna Vyalkova
@ 2023-01-12 10:32 ` Anna Vyalkova
2023-01-13 13:45 ` Joonas Niilola
2023-01-13 15:02 ` [gentoo-proxy-maint] [PATCH v3] " Anna Vyalkova
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Anna Vyalkova @ 2023-01-12 10:32 UTC (permalink / raw
To: gentoo-proxy-maint
In this episode:
* New: NNTPS support with different backends (openssl by default)
* New: PCRE2 support (enabled by default)
* Add missing virtual/libiconv dependency
* Add missing sys-devel/gettext bdep
* Drop net-mail/metamail optfeature dep (pmasked)
* Export BUILD_* variables
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
Changes since v1:
* Add a guard for SSL library
* Make "myeconfargs" variable local
I'm not sure about the clang patch added in 2.6.1-r1.
net-nntp/tin/Manifest | 1 +
net-nntp/tin/metadata.xml | 19 +++---
net-nntp/tin/tin-2.6.2.ebuild | 108 ++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 8 deletions(-)
create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9b..a1a8f0c73e 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/metadata.xml b/net-nntp/tin/metadata.xml
index e9e3c1ae47..22ce019d89 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+ <!-- maintainer-needed -->
+ <upstream>
+ <doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
+ </upstream>
+ <use>
+ <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+ <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+ <flag name="libtls" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="openssl" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/openssl</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="pcre2" restrict=">=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+ </use>
</pkgmetadata>
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 0000000000..a6e7e74584
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 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 +openssl +pcre2 sasl socks5 ssl"
+REQUIRED_USE="ssl? ( ^^ ( gnutls libtls openssl ) )"
+
+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:= )
+ libtls? ( dev-libs/libretls:= )
+ openssl? ( dev-libs/openssl:= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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_enable debug)
+ $(use_enable gpg pgp-gpg)
+ $(use_enable nls)
+ $(use_with pcre2 pcre2-config)
+ $(use_with !pcre2 pcre "${ESYSROOT}"/usr)
+ $(use_with socks5 socks) $(use_with socks5)
+ --disable-mime-strict-charset
+ --enable-nntp-only
+ --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 )
+ elif use openssl; then
+ myeconfargs+=( --with-nntps=openssl )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ 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-metamail="${EPREFIX}"/usr/bin/metamail
+ --with-sum="${EPREFIX}"/usr/bin/sum
+ )
+
+ 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
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [gentoo-proxy-maint] [PATCH v2] net-nntp/tin: add 2.6.2
2023-01-12 10:32 ` [gentoo-proxy-maint] [PATCH v2] " Anna Vyalkova
@ 2023-01-13 13:45 ` Joonas Niilola
2023-01-13 15:06 ` Anna (cybertailor) Vyalkova
0 siblings, 1 reply; 9+ messages in thread
From: Joonas Niilola @ 2023-01-13 13:45 UTC (permalink / raw
To: gentoo-proxy-maint
[-- Attachment #1.1: Type: text/plain, Size: 6454 bytes --]
I've merged your rssguard contributions, thanks! Some problems with tin
below:
On 12.1.2023 12.32, Anna Vyalkova wrote:
> In this episode:
>
> net-nntp/tin/Manifest | 1 +
> net-nntp/tin/metadata.xml | 19 +++---
> net-nntp/tin/tin-2.6.2.ebuild | 108 ++++++++++++++++++++++++++++++++++
> 3 files changed, 120 insertions(+), 8 deletions(-)
> create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
>
> +
> +src_configure() {
> + tc-export AR CC RANLIB
> + tc-export_build_env
> +
> + local myeconfargs=(
> + $(use_enable cancel-locks) $(use_with cancel-locks canlock)
Can we single-line this please?
> + $(use_enable debug)
> + $(use_enable gpg pgp-gpg)
> + $(use_enable nls)
> + $(use_with pcre2 pcre2-config)
> + $(use_with !pcre2 pcre "${ESYSROOT}"/usr)
> + $(use_with socks5 socks) $(use_with socks5)
This too. I don't mind if you separate these from the others via
newlines, e.g.
$(use_enable cancel-locks)
$(use_with cancel-locks canlock)
$(use_enable debug)
$(use_enable gpg pgp-gpg)
$(use_enable nls)
...
but this current way was surprisingly hard to read (since I've never
seen such being used).
> + --disable-mime-strict-charset
> + --enable-nntp-only
> + --enable-prototypes
> + --with-coffee # easter egg :)
> + --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
> + --with-screen=ncursesw
> + )
> +
I had a build failure with
USE="cancel-locks gnutls sasl socks5 ssl -debug -gpg -libtls -nls
-openssl -pcre2":
>>> Install net-nntp/tin-2.6.2 into
/var/tmp/portage/net-nntp/tin-2.6.2/image
make -j32 DESTDIR=/var/tmp/portage/net-nntp/tin-2.6.2/image install
make[1]: Entering directory
'/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
mkdir -p /var/tmp/portage/net-nntp/tin-2.6.2/image/usr/bin
make[2]: Entering directory
'/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./nntps.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./sigfile.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./signal.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./strftime.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./string.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./tags.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./tcurses.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./tmpfile.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./thread.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./version.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./wildmat.c
x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
-DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
-I/usr/include/libcanlock-3 -march=native -O2 -pipe
-frecord-gcc-switches -c ./xref.c
./nntps.c: In function 'tintls_open':
./nntps.c:281:53: error: 'verification_func' undeclared (first use in
this function)
281 | gnutls_session_set_verify_function(client,
&verification_func);
|
^~~~~~~~~~~~~~~~~
./nntps.c:281:53: note: each undeclared identifier is reported only once
for each function it appears in
make[2]: *** [Makefile:301: nntps.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory
'/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
make[1]: *** [Makefile:417: install] Error 2
make[1]: Leaving directory
'/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
make: *** [Makefile:415: install] Error 2
* ERROR: net-nntp/tin-2.6.2::gentoo failed (install phase):
* emake failed
Could you take a look? It's happening in install phase which is a bit weird.
-- juippis
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-proxy-maint] [PATCH v3] net-nntp/tin: add 2.6.2
2022-12-25 18:06 [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2 Anna Vyalkova
2023-01-12 10:32 ` [gentoo-proxy-maint] [PATCH v2] " Anna Vyalkova
@ 2023-01-13 15:02 ` Anna Vyalkova
2023-01-14 9:48 ` [gentoo-proxy-maint] [PATCH v4] " Anna Vyalkova
2023-01-14 10:28 ` [gentoo-proxy-maint] [PATCH v5] " Anna Vyalkova
3 siblings, 0 replies; 9+ messages in thread
From: Anna Vyalkova @ 2023-01-13 15:02 UTC (permalink / raw
To: gentoo-proxy-maint
In this update:
* New: NNTPS support with different backends (openssl by default)
* New: PCRE2 support (enabled by default)
* Add missing virtual/libiconv dependency
* Add missing sys-devel/gettext bdep
* Enable local news support
* Drop net-mail/metamail optfeature dep and don't mention it (pmasked)
* Export BUILD_* variables
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
Changes since v2:
- fixed REQUIRED_USE for gnutls
- fixed code style
- dropped "--with-socks5" (no effect in gentoo)
- replaced "--enable-nntp-only" with "--enable-nntp" for local news
support
net-nntp/tin/Manifest | 1 +
net-nntp/tin/metadata.xml | 19 +++---
net-nntp/tin/tin-2.6.2.ebuild | 120 ++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+), 8 deletions(-)
create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9b..a1a8f0c73e 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/metadata.xml b/net-nntp/tin/metadata.xml
index e9e3c1ae47..22ce019d89 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+ <!-- maintainer-needed -->
+ <upstream>
+ <doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
+ </upstream>
+ <use>
+ <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+ <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+ <flag name="libtls" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="openssl" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/openssl</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="pcre2" restrict=">=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+ </use>
</pkgmetadata>
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 0000000000..e4da1a32d8
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 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 +openssl +pcre2 sasl socks5 ssl"
+REQUIRED_USE="
+ gnutls? ( debug )
+ ssl? (
+ ^^ ( gnutls libtls openssl )
+ )
+"
+
+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:= )
+ libtls? ( dev-libs/libretls:= )
+ openssl? ( dev-libs/openssl:= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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 )
+ elif use openssl; then
+ myeconfargs+=( --with-nntps=openssl )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ 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
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [gentoo-proxy-maint] [PATCH v2] net-nntp/tin: add 2.6.2
2023-01-13 13:45 ` Joonas Niilola
@ 2023-01-13 15:06 ` Anna (cybertailor) Vyalkova
0 siblings, 0 replies; 9+ messages in thread
From: Anna (cybertailor) Vyalkova @ 2023-01-13 15:06 UTC (permalink / raw
To: gentoo-proxy-maint
On 2023-01-13 15:45, Joonas Niilola wrote:
> I've merged your rssguard contributions, thanks! Some problems with tin
> below:
>
> On 12.1.2023 12.32, Anna Vyalkova wrote:
> > In this episode:
> >
> > net-nntp/tin/Manifest | 1 +
> > net-nntp/tin/metadata.xml | 19 +++---
> > net-nntp/tin/tin-2.6.2.ebuild | 108 ++++++++++++++++++++++++++++++++++
> > 3 files changed, 120 insertions(+), 8 deletions(-)
> > create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
> >
> > +
> > +src_configure() {
> > + tc-export AR CC RANLIB
> > + tc-export_build_env
> > +
> > + local myeconfargs=(
> > + $(use_enable cancel-locks) $(use_with cancel-locks canlock)
>
> Can we single-line this please?
>
> > + $(use_enable debug)
> > + $(use_enable gpg pgp-gpg)
> > + $(use_enable nls)
> > + $(use_with pcre2 pcre2-config)
> > + $(use_with !pcre2 pcre "${ESYSROOT}"/usr)
> > + $(use_with socks5 socks) $(use_with socks5)
>
> This too. I don't mind if you separate these from the others via
> newlines, e.g.
>
> $(use_enable cancel-locks)
> $(use_with cancel-locks canlock)
>
> $(use_enable debug)
> $(use_enable gpg pgp-gpg)
> $(use_enable nls)
> ...
>
> but this current way was surprisingly hard to read (since I've never
> seen such being used).
Fixed both!
> > + --disable-mime-strict-charset
> > + --enable-nntp-only
> > + --enable-prototypes
> > + --with-coffee # easter egg :)
> > + --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
> > + --with-screen=ncursesw
> > + )
> > +
>
> I had a build failure with
> USE="cancel-locks gnutls sasl socks5 ssl -debug -gpg -libtls -nls
> -openssl -pcre2":
This is a bug, I'll report it upstream. USE="debug" is needed for gnutls
support (because of ifdefs). Added to REQUIRED_USE.
> >>> Install net-nntp/tin-2.6.2 into
> /var/tmp/portage/net-nntp/tin-2.6.2/image
> make -j32 DESTDIR=/var/tmp/portage/net-nntp/tin-2.6.2/image install
> make[1]: Entering directory
> '/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
> mkdir -p /var/tmp/portage/net-nntp/tin-2.6.2/image/usr/bin
> make[2]: Entering directory
> '/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./nntps.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./sigfile.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./signal.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./strftime.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./string.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./tags.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./tcurses.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./tmpfile.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./thread.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./version.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./wildmat.c
> x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../include -I/usr/include
> -DLOCALEDIR=\"/usr/share/locale\" -I../include -D_DEFAULT_SOURCE
> -D_XOPEN_SOURCE=600 -I/usr/include/ncursesw -D_XOPEN_SOURCE_EXTENDED
> -I/usr/include/libcanlock-3 -march=native -O2 -pipe
> -frecord-gcc-switches -c ./xref.c
> ./nntps.c: In function 'tintls_open':
> ./nntps.c:281:53: error: 'verification_func' undeclared (first use in
> this function)
> 281 | gnutls_session_set_verify_function(client,
> &verification_func);
> |
> ^~~~~~~~~~~~~~~~~
> ./nntps.c:281:53: note: each undeclared identifier is reported only once
> for each function it appears in
> make[2]: *** [Makefile:301: nntps.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[2]: Leaving directory
> '/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
> make[1]: *** [Makefile:417: install] Error 2
> make[1]: Leaving directory
> '/var/tmp/portage/net-nntp/tin-2.6.2/work/tin-2.6.2/src'
> make: *** [Makefile:415: install] Error 2
> * ERROR: net-nntp/tin-2.6.2::gentoo failed (install phase):
> * emake failed
>
> Could you take a look? It's happening in install phase which is a bit weird.
>
>
>
> -- juippis
>
Thanks for review :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-proxy-maint] [PATCH v4] net-nntp/tin: add 2.6.2
2022-12-25 18:06 [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2 Anna Vyalkova
2023-01-12 10:32 ` [gentoo-proxy-maint] [PATCH v2] " Anna Vyalkova
2023-01-13 15:02 ` [gentoo-proxy-maint] [PATCH v3] " Anna Vyalkova
@ 2023-01-14 9:48 ` Anna Vyalkova
2023-01-14 9:55 ` Joonas Niilola
2023-01-14 10:28 ` [gentoo-proxy-maint] [PATCH v5] " Anna Vyalkova
3 siblings, 1 reply; 9+ messages in thread
From: Anna Vyalkova @ 2023-01-14 9:48 UTC (permalink / raw
To: gentoo-proxy-maint
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 <cyber+gentoo@sysrq.in>
---
net-nntp/tin/Manifest | 1 +
net-nntp/tin/files/tin-2.6.2-gnutls.patch | 36 +++++++
net-nntp/tin/metadata.xml | 19 ++--
net-nntp/tin/tin-2.6.2.ebuild | 121 ++++++++++++++++++++++
4 files changed, 169 insertions(+), 8 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
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9b..a1a8f0c73e 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 0000000000..84f31f684c
--- /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 e9e3c1ae47..22ce019d89 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+ <!-- maintainer-needed -->
+ <upstream>
+ <doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
+ </upstream>
+ <use>
+ <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+ <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+ <flag name="libtls" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="openssl" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/openssl</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="pcre2" restrict=">=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+ </use>
</pkgmetadata>
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 0000000000..96f245218e
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 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 +openssl +pcre2 sasl socks5 ssl"
+REQUIRED_USE="
+ ssl? (
+ ^^ ( gnutls libtls openssl )
+ )
+"
+
+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:= )
+ libtls? ( dev-libs/libretls:= )
+ openssl? ( 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 )
+ elif use openssl; then
+ myeconfargs+=( --with-nntps=openssl )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ 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
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [gentoo-proxy-maint] [PATCH v4] net-nntp/tin: add 2.6.2
2023-01-14 9:48 ` [gentoo-proxy-maint] [PATCH v4] " Anna Vyalkova
@ 2023-01-14 9:55 ` Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2023-01-14 9:55 UTC (permalink / raw
To: gentoo-proxy-maint
[-- Attachment #1.1: Type: text/plain, Size: 1259 bytes --]
On 14.1.2023 11.48, Anna Vyalkova wrote:
> 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
>
Hey,
sorry that I failed to see this yesterday, but could we rework the whole
ssl logic in this ebuild? I just remembered we shouldn't use
REQUIRED_USE to choose an ssl implementation, but instead prioritize it
via use flag selection. See https://bugs.gentoo.org/781908. This was
better documented when libressl was around, and truthfully hasn't been
as much of a problem ever since libressl was removed.
So I'd suggest something like this:
RDEPEND="...
ssl? (
gnutls? ( net-libs/gnutls:= )
!gnutls (
libtls? ( dev-libs/libretls:= )
!libtls? ( dev-libs/openssl:= )
)
)
..."
src_configure() {
...
if use ssl; then
if use gnutls; then
myeconfargs+=( --with-nntps=gnutls )
elif ! use gnutls && use libtls; then
myeconfargs+=( --with-nntps=libtls )
else
myeconfargs+=( --with-nntps=openssl )
fi
fi
...
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-proxy-maint] [PATCH v5] net-nntp/tin: add 2.6.2
2022-12-25 18:06 [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2 Anna Vyalkova
` (2 preceding siblings ...)
2023-01-14 9:48 ` [gentoo-proxy-maint] [PATCH v4] " Anna Vyalkova
@ 2023-01-14 10:28 ` Anna Vyalkova
2023-01-14 18:07 ` Joonas Niilola
3 siblings, 1 reply; 9+ messages in thread
From: Anna Vyalkova @ 2023-01-14 10:28 UTC (permalink / raw
To: gentoo-proxy-maint
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 <cyber+gentoo@sysrq.in>
---
Changes since v4:
- remove REQUIRED_USE
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(-)
create mode 100644 net-nntp/tin/files/tin-2.6.2-gnutls.patch
create mode 100644 net-nntp/tin/tin-2.6.2.ebuild
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 035c264e9b..a1a8f0c73e 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 0000000000..84f31f684c
--- /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 e9e3c1ae47..2273dcd0ef 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+ <!-- maintainer-needed -->
+ <upstream>
+ <doc>http://www.tin.org/bin/man.cgi?section=1&topic=tin</doc>
+ </upstream>
+ <use>
+ <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+ <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+ <flag name="libtls" restrict=">=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+ <flag name="pcre2" restrict=">=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+ </use>
</pkgmetadata>
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 0000000000..d89c182703
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 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
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [gentoo-proxy-maint] [PATCH v5] net-nntp/tin: add 2.6.2
2023-01-14 10:28 ` [gentoo-proxy-maint] [PATCH v5] " Anna Vyalkova
@ 2023-01-14 18:07 ` Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2023-01-14 18:07 UTC (permalink / raw
To: gentoo-proxy-maint
[-- Attachment #1.1: Type: text/plain, Size: 438 bytes --]
On 14.1.2023 12.28, Anna Vyalkova wrote:
> 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
>
Perfect, merged now, thanks a lot!
-- juippis
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-14 18:07 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-25 18:06 [gentoo-proxy-maint] [PATCH] net-nntp/tin: add 2.6.2 Anna Vyalkova
2023-01-12 10:32 ` [gentoo-proxy-maint] [PATCH v2] " Anna Vyalkova
2023-01-13 13:45 ` Joonas Niilola
2023-01-13 15:06 ` Anna (cybertailor) Vyalkova
2023-01-13 15:02 ` [gentoo-proxy-maint] [PATCH v3] " Anna Vyalkova
2023-01-14 9:48 ` [gentoo-proxy-maint] [PATCH v4] " Anna Vyalkova
2023-01-14 9:55 ` Joonas Niilola
2023-01-14 10:28 ` [gentoo-proxy-maint] [PATCH v5] " Anna Vyalkova
2023-01-14 18:07 ` Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox