pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tin: Update to 2.6.2
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Wed Jan 11 12:38:08 2023 +0100
Changeset: 90cb3eb7483691b90a03932d903d348209e4a7e7
Modified Files:
Makefile
Added Files:
tin/COMMIT_MSG
tin/DESCR
tin/Makefile
tin/PLIST
tin/TODO
tin/distinfo
tin/options.mk
tin/patches/patch-Makefile
tin/patches/patch-src_Makefile.in
tin/patches/patch-src_nntplib.c
Log Message:
tin: Update to 2.6.2
Add upstream patch to fix build.
-- 2.6.2 release 20221224 "Pittyvaich" --
009) Florian Weimer <fweimer%redhat.com@localhost>
Thomas E. Dickey <dickey%invisible-island.net@localhost>
ADD. missing #include directives to improve C99 compatibility
FIX. aclocal.m4, configure
008) Enrik Berkhan <enrik%tin.org@localhost>
BUG. remove alleged Y2K38 safety issues
ADD. ~ and $VAR expansion to tinrc option tls_ca_cert_file
ADD. simplify code and refactor to fix an unused variable complaint
ADD. pcre2 support (debian bug #999941, fedora bug #2128388)
ADD. NNTPS support based on libressl/GNUttls/OpenSSL (RFC 8143)
ADD. TLS connection info
ADD. switch from stdio to own buffer implementation
FIX. config.c, cook.c, feed.c, filter.c, group.c, init.c, lang.c, main.c
memory.c, misc.c, nntplib.c, nntps.c, options_menu.c, page.c, read.c
regex.c, save.c, screen.c, search.c, select.c, wildmat.c
autoconf.h[in], extern.h, nntplib.h, proto.h, tinrc.h, tin.h
tnntp.h, tnntps.h, tincfg.tbl, parsdate.y, configure[.in]
Makefile[.in], tin.1
007) Dennis Preiser <dennis%d--p.de@localhost>
BUG. backward search for a non empty line got stuck in endless loop
BUG. reading a faulty mime article via NNTP could hang tin
(debian bug #1005024)
BUG. a long group name isn't shortened appropriately in group level
BUG. config changes via 'M'enu were not immediately active for
show_signatures, verbatim_handling, tex2iso_conf and
trim_article_body
BUG. after posting an article from selection or group level the cursor
remains visible in the lower left corner
ADD. tinrc.show_help_mail_sign
ADD. get $TMPDIR just once
ADD. option to remove SOFT HYPHENs (U+00AD) from non verbatim blocks of
articles in UTF-8 and using a UTF-8 locale
BUG. show actual help-key in txt_type_h_for_help
FIX. config.c, cook.c, debug.c, filter.c, group.c, init.c, lang.c, mail.c
misc.c, my_tmpfile.c, newsrc.c, options_menu.c, page.c, pgp.c
regex.c, rfc2046.c, refs.c, save.c, screen.c, search.c, select.c
thread.c, extern.h, proto.h, tin.h, tinrc.h, tincfg.tbl, tin.1
tin.5
006) Thomas E. Dickey <dickey%invisible-island.net@localhost>
BUG. configure --with-included-gettext was non-functional since tin 2.4.2
ADD. update configure macros
FIX. aclocal.m4, intl/Makefile.in, intl/plural.c
005) Urs Janssen <urs%tin.org@localhost>
ADD. config.guess, config.sub update
ADD. code cleanup; remove redundant condition and unused var;
add some missing casts and _Noreturn
ADD. ignore set but empty env.-vars
ADD. try harder when looking for keymap-file, try locale "suffixes"
from language[_territory[.codeset]][@modifier] with parts
stripped off in order: codeset, normalized codeset, territory,
modifier
ADD. guard against empty inews_prog and empty mm_charset in
!CHARSET_CONVERSION case
ADD. warn about some more nonsensical cmd.-line option combinations
-ow|-oz|-wz
ADD. exit early at -o when there are no postponed articles
ADD. reduce memory usage for xface
ADD. list of leap years from 2040 to 2068
ADD. restrict URL_REGEX to disallow non ascii chars in path
ADD. accept active file lines even without moderation flag
ADD. do not try NEXT again after an ERR_COMMAND response
ADD. ConnectionInfo page ('J')
ADD. update tin_atol() to new SI prefix names Ronna and Quetta
ADD. experimental MAXARTNUM extension
BUG. missing default tinrc.editor_format on first start
BUG. typo in man page
BUG. possible memleak in check_article_to_be_posted if article has
multiple To:, Followup-To: or Newsgroups:-headers
BUG. possible buffer overflow in find_reply_to_addr
BUG. f'up to an article without a message-id (possible in mailgroups)
crashes
BUG. hypothetic missing string termination
BUG. need to convert utf8pass to network charset unconditionally in
do_authinfo_sasl_plain
FIX. active.c, art.c, auth.c, config.c, filter.c, group.c, help.c
inews.c, init.c, keymap.c, lang.c, main.c, makecfg.c, mimetypes.c
misc.c, nntplib.c, options_menu.c, page.c, post.c, pgp.c, rfc1524.c
rfc2046.c, save.c, select.c, signal.c, string.c, thread.c, wildmat.c
xface.c, parsdate.y, extern.h, keymap.h, nntplib.h, proto.h, tin.h
tin.1, tin.5, config.guess, config.sub, configure[.in]
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=90cb3eb7483691b90a03932d903d348209e4a7e7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
tin/COMMIT_MSG | 90 +++++++++++++++++++++++++++++++++++++++
tin/DESCR | 1 +
tin/Makefile | 64 ++++++++++++++++++++++++++++
tin/PLIST | 29 +++++++++++++
tin/TODO | 2 +
tin/distinfo | 8 ++++
tin/options.mk | 60 ++++++++++++++++++++++++++
tin/patches/patch-Makefile | 15 +++++++
tin/patches/patch-src_Makefile.in | 14 ++++++
tin/patches/patch-src_nntplib.c | 46 ++++++++++++++++++++
11 files changed, 330 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 393b2bcb32..5fa4d51006 100644
--- a/Makefile
+++ b/Makefile
@@ -5706,6 +5706,7 @@ SUBDIR+= tilda
SUBDIR+= tilix
SUBDIR+= timewarrior
SUBDIR+= timg
+SUBDIR+= tin
SUBDIR+= tintin++
SUBDIR+= tinyca2
SUBDIR+= tinycobol
diff --git a/tin/COMMIT_MSG b/tin/COMMIT_MSG
new file mode 100644
index 0000000000..3acae2a274
--- /dev/null
+++ b/tin/COMMIT_MSG
@@ -0,0 +1,90 @@
+news/tin: Update to 2.6.2
+
+Add upstream patch to fix build.
+
+-- 2.6.2 release 20221224 "Pittyvaich" --
+
+ 009) Florian Weimer <fweimer%redhat.com@localhost>
+ Thomas E. Dickey <dickey%invisible-island.net@localhost>
+ ADD. missing #include directives to improve C99 compatibility
+ FIX. aclocal.m4, configure
+
+ 008) Enrik Berkhan <enrik%tin.org@localhost>
+ BUG. remove alleged Y2K38 safety issues
+ ADD. ~ and $VAR expansion to tinrc option tls_ca_cert_file
+ ADD. simplify code and refactor to fix an unused variable complaint
+ ADD. pcre2 support (debian bug #999941, fedora bug #2128388)
+ ADD. NNTPS support based on libressl/GNUttls/OpenSSL (RFC 8143)
+ ADD. TLS connection info
+ ADD. switch from stdio to own buffer implementation
+ FIX. config.c, cook.c, feed.c, filter.c, group.c, init.c, lang.c, main.c
+ memory.c, misc.c, nntplib.c, nntps.c, options_menu.c, page.c, read.c
+ regex.c, save.c, screen.c, search.c, select.c, wildmat.c
+ autoconf.h[in], extern.h, nntplib.h, proto.h, tinrc.h, tin.h
+ tnntp.h, tnntps.h, tincfg.tbl, parsdate.y, configure[.in]
+ Makefile[.in], tin.1
+
+ 007) Dennis Preiser <dennis%d--p.de@localhost>
+ BUG. backward search for a non empty line got stuck in endless loop
+ BUG. reading a faulty mime article via NNTP could hang tin
+ (debian bug #1005024)
+ BUG. a long group name isn't shortened appropriately in group level
+ BUG. config changes via 'M'enu were not immediately active for
+ show_signatures, verbatim_handling, tex2iso_conf and
+ trim_article_body
+ BUG. after posting an article from selection or group level the cursor
+ remains visible in the lower left corner
+ ADD. tinrc.show_help_mail_sign
+ ADD. get $TMPDIR just once
+ ADD. option to remove SOFT HYPHENs (U+00AD) from non verbatim blocks of
+ articles in UTF-8 and using a UTF-8 locale
+ BUG. show actual help-key in txt_type_h_for_help
+ FIX. config.c, cook.c, debug.c, filter.c, group.c, init.c, lang.c, mail.c
+ misc.c, my_tmpfile.c, newsrc.c, options_menu.c, page.c, pgp.c
+ regex.c, rfc2046.c, refs.c, save.c, screen.c, search.c, select.c
+ thread.c, extern.h, proto.h, tin.h, tinrc.h, tincfg.tbl, tin.1
+ tin.5
+
+ 006) Thomas E. Dickey <dickey%invisible-island.net@localhost>
+ BUG. configure --with-included-gettext was non-functional since tin 2.4.2
+ ADD. update configure macros
+ FIX. aclocal.m4, intl/Makefile.in, intl/plural.c
+
+ 005) Urs Janssen <urs%tin.org@localhost>
+ ADD. config.guess, config.sub update
+ ADD. code cleanup; remove redundant condition and unused var;
+ add some missing casts and _Noreturn
+ ADD. ignore set but empty env.-vars
+ ADD. try harder when looking for keymap-file, try locale "suffixes"
+ from language[_territory[.codeset]][@modifier] with parts
+ stripped off in order: codeset, normalized codeset, territory,
+ modifier
+ ADD. guard against empty inews_prog and empty mm_charset in
+ !CHARSET_CONVERSION case
+ ADD. warn about some more nonsensical cmd.-line option combinations
+ -ow|-oz|-wz
+ ADD. exit early at -o when there are no postponed articles
+ ADD. reduce memory usage for xface
+ ADD. list of leap years from 2040 to 2068
+ ADD. restrict URL_REGEX to disallow non ascii chars in path
+ ADD. accept active file lines even without moderation flag
+ ADD. do not try NEXT again after an ERR_COMMAND response
+ ADD. ConnectionInfo page ('J')
+ ADD. update tin_atol() to new SI prefix names Ronna and Quetta
+ ADD. experimental MAXARTNUM extension
+ BUG. missing default tinrc.editor_format on first start
+ BUG. typo in man page
+ BUG. possible memleak in check_article_to_be_posted if article has
+ multiple To:, Followup-To: or Newsgroups:-headers
+ BUG. possible buffer overflow in find_reply_to_addr
+ BUG. f'up to an article without a message-id (possible in mailgroups)
+ crashes
+ BUG. hypothetic missing string termination
+ BUG. need to convert utf8pass to network charset unconditionally in
+ do_authinfo_sasl_plain
+ FIX. active.c, art.c, auth.c, config.c, filter.c, group.c, help.c
+ inews.c, init.c, keymap.c, lang.c, main.c, makecfg.c, mimetypes.c
+ misc.c, nntplib.c, options_menu.c, page.c, post.c, pgp.c, rfc1524.c
+ rfc2046.c, save.c, select.c, signal.c, string.c, thread.c, wildmat.c
+ xface.c, parsdate.y, extern.h, keymap.h, nntplib.h, proto.h, tin.h
+ tin.1, tin.5, config.guess, config.sub, configure[.in]
diff --git a/tin/DESCR b/tin/DESCR
new file mode 100644
index 0000000000..a99b0fa123
--- /dev/null
+++ b/tin/DESCR
@@ -0,0 +1 @@
+TIN: Easy to use threaded newsreader with NOV/NNTP support.
diff --git a/tin/Makefile b/tin/Makefile
new file mode 100644
index 0000000000..e5d827874e
--- /dev/null
+++ b/tin/Makefile
@@ -0,0 +1,64 @@
+# $NetBSD$
+
+DISTNAME= tin-2.6.2
+CATEGORIES= news
+MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/
+MASTER_SITES+= http://ftp.funet.fi/pub/unix/news/tin-unoff/
+MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/
+MASTER_SITES+= ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/
+MASTER_SITES+= ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.tin.org/
+COMMENT= USENET newsreader (termcap based)
+# See src/nntplib.c, vms/vms.c
+LICENSE= tin-license
+
+RESTRICTED= Profit from use, sale, trade, or reproduction disallowed
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+
+INSTALLATION_DIRS= share/doc/tin
+
+# for tinews.pl
+USE_TOOLS+= msgfmt perl:run pkg-config yacc
+REPLACE_PERL= tools/*.pl
+BUILD_TARGET= build
+
+.include "options.mk"
+
+CONFIGURE_ARGS+= --with-nntp-default-server=news
+CONFIGURE_ARGS+= --with-mime-default-charset=ISO-8859-1
+CONFIGURE_ARGS+= --enable-break-long-lines
+CONFIGURE_ARGS+= --with-gpg=${PREFIX}/bin/gpg
+CONFIGURE_ARGS+= --with-ispell=${PREFIX}/bin/ispell
+CONFIGURE_ARGS+= --with-metamail=${PREFIX}/bin/metamail
+CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+= --disable-mime-strict-charset
+CONFIGURE_ARGS+= --with-defaults-dir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --enable-mh-mail-handling
+CONFIGURE_ARGS+= --with-coffee
+
+SUBST_CLASSES+= tin
+SUBST_STAGE.tin= pre-configure
+SUBST_MESSAGE.tin= Adjusting path to the configuration directory.
+SUBST_FILES.tin= doc/tin.1
+SUBST_SED.tin= -e 's:/etc/nntpserver:${PKG_SYSCONFDIR}/nntp/server:'
+
+post-configure:
+ ${ECHO} '#define NNTP_SERVER_FILE "${PKG_SYSCONFDIR}/nntp/server"' >>${WRKSRC}/include/autoconf.h
+ ${ECHO} '#define SMTP_SERVER_FILE "${PKG_SYSCONFDIR}/smtpserver"' >>${WRKSRC}/include/autoconf.h
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/tin
+ ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/mmdf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/tin-mmdf.5
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../converters/uulib/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/tin/PLIST b/tin/PLIST
new file mode 100644
index 0000000000..5e6a2e0ae3
--- /dev/null
+++ b/tin/PLIST
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.13 2019/01/15 15:48:17 wiz Exp $
+bin/metamutt
+bin/opt-case.pl
+bin/rtin
+bin/tin
+bin/tinews.pl
+bin/url_handler.pl
+bin/w2r.pl
+man/man1/opt-case.pl.1
+man/man1/rtin.1
+man/man1/tin.1
+man/man1/tinews.pl.1
+man/man1/url_handler.pl.1
+man/man1/w2r.pl.1
+man/man5/rtin.5
+man/man5/tin-mmdf.5
+man/man5/tin.5
+share/doc/tin/WHATSNEW
+${PLIST.nls}share/locale/da/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/en_GB/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/tin.mo
diff --git a/tin/TODO b/tin/TODO
new file mode 100644
index 0000000000..9de69e3572
--- /dev/null
+++ b/tin/TODO
@@ -0,0 +1,2 @@
+[ ] Check whether recent tin or pdcurses is broken
+ See wip/pdcurses
diff --git a/tin/distinfo b/tin/distinfo
new file mode 100644
index 0000000000..c0fe5d8436
--- /dev/null
+++ b/tin/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.33 2022/01/12 11:41:41 micha Exp $
+
+BLAKE2s (tin-2.6.2.tar.xz) = 632d2a39bc2ce3f23e0949edad87aa4681eb1ab69b68b4a55e7f7521a6341b3a
+SHA512 (tin-2.6.2.tar.xz) = 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
+Size (tin-2.6.2.tar.xz) = 1598732 bytes
+SHA1 (patch-Makefile) = c5787ae88d070844b43f56e968d2fab00a8613ad
+SHA1 (patch-src_Makefile.in) = 11785ab8fb5391d91ff34981bbb77191f228bed5
+SHA1 (patch-src_nntplib.c) = 75a14821af4a01b9f0787411edf1370c5af6da63
diff --git a/tin/options.mk b/tin/options.mk
new file mode 100644
index 0000000000..1586409c46
--- /dev/null
+++ b/tin/options.mk
@@ -0,0 +1,60 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.tin
+PKG_OPTIONS_REQUIRED_GROUPS= display
+PKG_OPTIONS_GROUP.display= curses termcap
+PKG_SUPPORTED_OPTIONS= canlock icu inet6 nls tin-use-inn-spool tls
+# curses(configured to curses) still does not work on NetBSD, see PR #51819
+# Suggest termcap instead of curses.
+PKG_SUGGESTED_OPTIONS= canlock inet6 nls termcap tls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcanlock)
+.include "../../news/libcanlock/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-cancel-locks
+.endif
+
+# Use curses option and CURSES_DEFAULT in mk.conf to select type
+.if !empty(PKG_OPTIONS:Mcurses)
+.include "../../mk/curses.buildlink3.mk"
+CONFIGURE_ARGS+= --with-screen=${CURSES_TYPE}
+CONFIGURE_ARGS+= --with-curses-dir=${BUILDLINK_PREFIX.curses}
+.endif
+
+.if !empty(PKG_OPTIONS:Mtermcap)
+.include "../../mk/termcap.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Micu)
+.include "../../textproc/icu/buildlink3.mk"
+.endif
+
+.if empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+PLIST_VARS+= nls
+.if !empty(PKG_OPTIONS:Mnls)
+PLIST.nls= yes
+.include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-nls
+.else
+CONFIGURE_ARGS+= --disable-nls
+.endif
+
+.if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
+BUILD_DEFS+= INN_DATA_DIR VARBASE
+INN_DATA_DIR?= ${VARBASE}/news
+CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
+ --with-libdir=${INN_DATA_DIR}/db \
+ --with-spooldir=${INN_DATA_DIR}/spool/articles \
+ --with-nov-dir=${INN_DATA_DIR}/spool/overview
+.else
+CONFIGURE_ARGS+= --enable-nntp-only
+.endif
+
+.if !empty(PKG_OPTIONS:Mtls)
+.include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-nntps=openssl
+.endif
diff --git a/tin/patches/patch-Makefile b/tin/patches/patch-Makefile
new file mode 100644
index 0000000000..6ea1626045
--- /dev/null
+++ b/tin/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Do not ignore error for missing src/Makefile.
+
+--- Makefile.orig
++++ Makefile
+@@ -409,7 +409,7 @@ all:
+ @$(ECHO) " "
+
+ build:
+- @-if $(TEST) -r $(SRCDIR)/Makefile ; then $(CD) $(SRCDIR) && $(MAKE) ; else $(ECHO) "You need to run configure first - didn't you read README?" ; fi
++ @if $(TEST) -r $(SRCDIR)/Makefile ; then $(CD) $(SRCDIR) && $(MAKE) ; else $(ECHO) "You need to run configure first - didn't you read README?" ; fi
+
+ install:
+ @$(CD) $(SRCDIR) && $(MAKE) install
diff --git a/tin/patches/patch-src_Makefile.in b/tin/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..f13e018d3c
--- /dev/null
+++ b/tin/patches/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Do not install mbox manpage.
+
+--- src/Makefile.in.orig 2020-12-01 10:52:35.000000000 +0000
++++ src/Makefile.in
+@@ -351,7 +351,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+ @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+ @$(ECHO) ".so $(INS_MANUAL_DIR)5/$(PROJECT).5" > $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+ @$(CHMOD) 444 $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+- @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
+ @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
+
+ uninstall_manpage :
diff --git a/tin/patches/patch-src_nntplib.c b/tin/patches/patch-src_nntplib.c
new file mode 100644
index 0000000000..0a1fcbf26c
--- /dev/null
+++ b/tin/patches/patch-src_nntplib.c
@@ -0,0 +1,46 @@
+$NetBSD$
+
+Adjust s_close() to close() because of move from stdio to own buffer
+implementation.
+
+From upstream:
+news://news.tin.org/mailman.1265.1672300926.1791.tin-dev%tin.org@localhost
+
+--- src/nntplib.c 2022-12-25 11:00:37 +0000
++++ src/nntplib.c 2022-12-29 07:56:58 +0000
+@@ -523,7 +523,7 @@
+ my_fprintf(stderr, _(txt_connection_to), (char *) inet_ntoa(sock_in.sin_addr));
+ perror("");
+ # endif /* HAVE_INET_NTOA */
+- (void) s_close(s);
++ (void) close(s);
+ }
+
+ if (x < 0) {
+@@ -552,7 +552,7 @@
+ if (connect(s, (struct sockaddr *) &sock_in) < 0) {
+ save_errno = errno;
+ perror("connect");
+- (void) s_close(s);
++ (void) close(s);
+ return -save_errno;
+ }
+
+@@ -571,7 +571,7 @@
+ if (connect(s, (struct sockaddr *) &sock_in, sizeof(sock_in)) < 0) {
+ save_errno = errno;
+ perror("connect");
+- (void) s_close(s);
++ (void) close(s);
+ return -save_errno;
+ }
+
+@@ -723,7 +723,7 @@
+
+ if (connect(s, (struct sockaddr *) &sdn, sizeof(sdn)) < 0) {
+ nerror("connect");
+- s_close(s);
++ close(s);
+ return -1;
+ }
+
Home |
Main Index |
Thread Index |
Old Index