Tue Apr 13 21:18:01 2010 UTC ()
update from 2.5.1 -> 2.5.2

Vendor update message (excerpt):

Many thanks to Julien �LIE for preparing this release.

Special notes:

The way checkpoints are handled by innreport for innd and innfeed has totally changed to provide more accurate daily statistics. The first Usenet report after an upgrade to INN 2.5.2 will probably contain incorrect statistics for incoming and outgoing articles because the beginning of the log files that will be used was generated by a previous version of INN.

A new version of innreport.conf is shipped with INN 2.5.2 but, in order to preserve any local changes, will not be automatically installed with make update. The changes are minor and not mandatory for the upgrade.

Changes from 2.5.1 to 2.5.2

    * Julien Elie has implemented in innd the new version of the NNTP protocol described in RFC 3977, RFC 4643 and RFC 4644, and innd now recognizes the CAPABILITIES command. Despite these standards, three commands (IHAVE, CHECK and TAKETHIS) will continue, for interoperability reasons, to return a reject code (respectively 435, 438, and 439) when the command contains a syntax error instead of 501. The mandatory username argument for authenticated peers is not enforced in INN 2.5.2 but will be be enforced by INN 2.6.0 when it is released.

Major improvements are:

    * innd now has a decent parser for NNTP commands. The parser is more correct (commands like "IHAVEZ<>", without a space between the command and its argument, are no longer valid) and allows leading and trailing whitespaces in commands. innd also now checks the length of the NNTP command sent by the client. If the command contains more than 512 bytes (or 497 bytes for an argument), an error is returned and the command is discarded. After ten unrecognized commands, innd closes the connection with the appropriate code (400 instead of 500).
    * The output of the HELP command specifies the arguments expected by NNTP commands, similar to nnrpd's HELP command.
    * LIST ACTIVE, LIST ACTIVE.TIMES and LIST NEWSGROUPS now allow an optional wildmat argument to restrict the results of those commands to specific newsgroups.
    * When using HEAD or STAT with an article number or a range, 412 (no group selected) is now returned instead of 501 (syntax error).
    * Jeffrey M. Vinocur has implemented support in both innd and nnrpd for whitespace in usernames/passwords provided with AUTHINFO USER/PASS. They were previously treated as invalid arguments or incorrectly parsed. innd and nnrpd now treat everything after the first whitespace character following AUTHINFO USER/PASS, up to, but not including, the final CRLF, as the username/password, in conformity with RFC 4643.
    * The syntax of message-IDs is now based on RFC 5536 (USEFOR) instead of RFC 1036. The major change is that quoted-pairs have been removed from the syntax.
    * The Perl and Python filters for innd now check the message-ID of articles arriving through TAKETHIS. Only CHECK and IHAVE commands previously used them.
    * Case-insensitive matches are now used for distributions, path identities, IMAP commands, header names, and control commands. (Newsgroups are still matched case-sensitively.) Message-IDs are case-sensitively matched, except for history hashes.
    * The new Archive:, Archive-At:, Comments:, and Summary: header fields defined in RFC 5064 and RFC 5536 can be used in innd filters. nnrpd now checks at injection time that an article does not contain an Injection-Info: header, that an Injection-Date: header (if provided) is valid, and that the Path: header does not contain ".POSTED". Note that INN does not yet generate these two injection fields or include the new Path: header field ".POSTED" keyword. These new features will be in the next major release of INN.
    * LIST SUBSCRIPTIONS now accepts an optional wildmat argument to restrict the results of this command to specific newsgroups.
    * nnrpd now supports a new LIST variant named COUNTS. LIST COUNTS is a combination of LIST ACTIVE and GROUP. It returns the same result as LIST ACTIVE except that the number of articles in a newsgroup is inserted before its status.
    * A new flag has been added to newsfeeds entries: "Aj", when present, says to feed articles accepted and filed in "junk" (due to *wanttrash*) to peers based on their newsfeeds feed patterns applied to the Newsgroups: header as though the article were accepted and all those groups were locally carried. This is useful if you want to run INN with a minimal active file and propagate all posts. Thanks to Andrew Gierth for the patch.
    * A new parameter has been added to inn.conf: *logtrash* defines whether a line for articles posted to groups not locally carried by the news server should be added in the news log file to report unwanted newsgroups. The default is true but it can be useful to set it to false (especially when *wanttrash* is also used).
    * The procbatchdir keyword has been added to news.daily to specify the backlog directory of innfeed. This is useful when several instances of innfeed are running or when its configuration file is not the default one.
    * sm now supports a new flag, -c, which shows a decoded form of the storage API token. This was previously done by the contrib showtoken script developed by Olaf Titz and Marco d'Itri.
    * The O flag in newsfeeds now relies on the contents of the Injection-Info: header field if it is present to determine the origin of an article. It falls back on X-Trace: if there is no Injection-Info: header field.
    * A new "unsigned long" type bas been added to the configuration parser. It will properly warn the news administrator when a variable supposed to be positive contains a negative integer. It will prevent INN from crashing due to misconfiguration at several places where it did not expect negative values.
    * innxbatch and innxmit now recognize the new 403 code introduced by RFC 3977 for a problem preventing the requested action from being taken.
    * HDR and OVER commands now return the correct 423 code (instead of 420) when the current article number is used but the article no longer exists.
    * actsync, inews, innxbatch, innxmit, nntpget and rnews can now authenticate to news servers which only expect a username, without password, conforming to RFC 4643.
    * The keyword generation code now generates a Keywords: header only if the original article does not already have one. The generated Keywords: header no longer begins with a comma. If keyword generation is set to true in inn.conf but the Keywords: header is not stored in the overview, the news administrator is warned and keyword generation deactivated, since it exists only to populate the overview data.
    * Two segfaults in keyword generation were fixed. The first occurred when an article already had a Keywords: header longer than the *keylimit* parameter. The second was caused by a possible invalid pointer beyond the newly allocated Keywords: header.
    * Fixed innd handling of empty lines. innd was not properly discarding an empty command and was closing the connection when it received only whitespace in a command.
    * Fixed a bug in how innd responded to reader commands when readers were not allowed. A superfluous blank line was sent in its response.
    * Fixed a bug in innd's response to TAKETHIS when authentication is required. Previously, 480 code was returned immediately without accepting the multi-line data block first, which broke synchronization in the NNTP protocol.
    * Fixed a bug in recognizing the article terminator when empty articles were fed to innd via IHAVE or TAKETHIS, leading to treating subsequent NNTP commands as part of the article.
    * When innd could not provide information for LIST ACTIVE.TIMES and LIST NEWSGROUPS, it was returning an invalid error message without a response code. The proper 503 answer code is now returned.
    * When an unauthenticated user tried to post an article, nnrpd replied 440 (posting not allowed) instead of the correct 480 (authentication required) response if the user might be able to post after authentication. Thanks to Daniel Weber for the bug report.
    * Fixed a bug in both innd and nnrpd answers to LIST commands where the output was not checked for valid dot stuffing.
    * Fixed a bug leading to junked non-control articles being sent to control-only feeds, and also fixed handling of poisoned control groups. Thanks to Andrew Gierth for the patch.
    * Fixed a bug in innreport leading to incorrect summing of innd stats when *hostname* was set to an IPv6 address instead of a fully-qualified domain name. Thanks to Petr Novopashenniy for the bug report.
    * Changed how innreport uses innd and innfeed checkpoint messages. Previously, connections held open for multiple days led to skewed and incorrect statistics on how many articles had been received or sent. The count is now more accurate and, for each connection of a feed, only depends on *incominglogfrequency* in inn.conf and *stats-period* in innfeed.conf.
    * Fixed a bug in nnrpd Perl filter: a header field whose name begins with the name of a standardized header field was not properly handled.
    * Fixed a bug in how innd was parsing Message-ID: and Supersedes: headers which contained trailing whitespace. The article was corrupted by an unexpected "\r" in the middle of the header. nnrpd now checks the syntax of the Message-ID: header field, if present.
    * Fixed various bugs in how leading whitespace was treated in headers. The HDR, XHDR and XPAT commands were not properly showing leading whitespace in header values. Lone "\n" and "\r" characters are now changed into spaces and "\r\n" is just removed. archive, makehistory, and tdx-util now keep leading whitespace in headers when generating overview data, and archive now changes "\n" (when not preceded by "\r") into a space when generating overview data.
    * Fixed a bug in the generation of overview data which may corrupt previously generated overview data when a pseudo Xref: header field is injected in an extra overview field.
    * Fixed a bug in the parsing of the *ovgrouppat* wildmat in inn.conf that prevented overview data from being generated when poisoned groups were specified but a latter sub-pattern matched the group. A uwildmat expression is now correctly handled, and a potential segfault has been fixed. Thanks to Dieter Stussy for the bug report.
    * Fixed a bug when HDR, XHDR and XPAT were used when *virtualhost* was set to true in readers.conf. The Xref: header of articles posted to only one newsgroup appeared empty.
    * Fixed a bug in tdx-util in parsing empty overview fields when called with -A or -F.
    * Fixed a bug in cvtbatch, which was returning only the size of the headers of an article when the "b" parameter was used with the -w flag. It now correctly returns the size of the whole article, which is what "b" was documented to do. cvtbatch also has a new "t" parameter, which can be used with the -w flag to retrieve the arrival time of an article.
    * Fixed a bug in how mailpost handles cross-posting feature. It was not properly detaching from sendmail. Thanks to Harald Dunkel for the patch.
    * Fixed a bug in the newsfeeds C flag: the count of followup groups was one less than the real number. When the value of the Followup-To: header field is "poster", it is no longer considered to be a followup. Thanks to Dieter Stussy for the patch.
    * When using tradindexed, the overview data for a cancelled article is now immediately removed from the overview. Thanks to Lars Magne Ingebrigtsen for the patch.
    * batcher has not supported the retrieval of an article with its file name for a long time. The -S flag has therefore been removed.
    * inews no longer rejects articles that contain more than 50 header fields. Thanks to Torsten Jerzembeck for the bug report.
    * news.daily no longer sends superfluous mails when the nomail keyword is given. Mail is only sent when there is real output. Previously, there would always be headings and empty lines left over from the structuring of the full report, which are now ommitted. Also, the output of programs executed with postexec is now included in the regular mail. Thanks to Florian Schlichting for the patch.
    * innconfval no longer maps NULL string or list values to an empty string or list and instead maps them to undefined values. This fixes an issue reported by Kamil Jonca: nnrpd was inserting an empty Organization: header when the *organization* parameter in inn.conf was unset.
    * Other minor bug fixes and documentation improvements.


(spz)
diff -r1.102 -r1.103 pkgsrc/news/inn/Makefile
diff -r1.25 -r1.26 pkgsrc/news/inn/distinfo
diff -r1.5 -r1.6 pkgsrc/news/inn/options.mk
diff -r1.9 -r1.10 pkgsrc/news/inn/patches/patch-ab

cvs diff -r1.102 -r1.103 pkgsrc/news/inn/Makefile (expand / switch to unified diff)

--- pkgsrc/news/inn/Makefile 2010/01/17 12:02:37 1.102
+++ pkgsrc/news/inn/Makefile 2010/04/13 21:18:00 1.103
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.102 2010/01/17 12:02:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.103 2010/04/13 21:18:00 spz Exp $
2 2
3DISTNAME= inn-2.5.1 3DISTNAME= inn-2.5.2
4PKGREVISION= 2 
5CATEGORIES= news 4CATEGORIES= news
6MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ 5MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \
7 ftp://ftp.fu-berlin.de/unix/news/inn/ 6 ftp://ftp.fu-berlin.de/unix/news/inn/
8 7
9MAINTAINER= spz@NetBSD.org 8MAINTAINER= spz@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/inn/ 9HOMEPAGE= http://www.isc.org/software/inn/
11COMMENT= The public release of InterNet News (INN) 10COMMENT= The public release of InterNet News (INN)
12LICENSE= modified-bsd AND gnu-gpl-v2 11LICENSE= modified-bsd AND gnu-gpl-v2
13 12
14CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* 13CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]*
15 14
16.include "Makefile.common" 15.include "Makefile.common"
17 16
18BUILD_DEFS+= INN_DATA_DIR 17BUILD_DEFS+= INN_DATA_DIR
19BUILD_DEFS+= VARBASE 18BUILD_DEFS+= VARBASE
20 19
21FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q} 20FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR}
22 21
23BUILD_DEFS+= INN_PATHBIN 22BUILD_DEFS+= INN_PATHBIN
24FILES_SUBST+= INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q} 23FILES_SUBST+= INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q}
25 24
26MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} 25MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
27 26
28PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} 27PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
29 28
30GNU_CONFIGURE= YES 29GNU_CONFIGURE= YES
31GNU_CONFIGURE_PREFIX= ${INN_PREFIX} 30GNU_CONFIGURE_PREFIX= ${INN_PREFIX}
32GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} 31GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}
33CONFIGURE_ARGS+= --enable-setgid-inews \ 32CONFIGURE_ARGS+= --enable-setgid-inews \
34 --enable-largefiles \ 33 --enable-largefiles \
@@ -36,34 +35,34 @@ CONFIGURE_ARGS+= --enable-setgid-inews  @@ -36,34 +35,34 @@ CONFIGURE_ARGS+= --enable-setgid-inews
36 --sbindir=${PREFIX}/${INN_PATHBIN} \ 35 --sbindir=${PREFIX}/${INN_PATHBIN} \
37 --sysconfdir=${PREFIX}/etc/inn \ 36 --sysconfdir=${PREFIX}/etc/inn \
38 --with-openssl=${SSLBASE:Q} \ 37 --with-openssl=${SSLBASE:Q} \
39 --with-doc-dir=${PREFIX}/share/doc/inn \ 38 --with-doc-dir=${PREFIX}/share/doc/inn \
40 --with-control-dir=${PREFIX}/${INN_PATHBIN}/control \ 39 --with-control-dir=${PREFIX}/${INN_PATHBIN}/control \
41 --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \ 40 --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
42 --with-tmp-dir=${INN_DATA_DIR}/tmp \ 41 --with-tmp-dir=${INN_DATA_DIR}/tmp \
43 --with-db-dir=${INN_DATA_DIR}/db \ 42 --with-db-dir=${INN_DATA_DIR}/db \
44 --with-http-dir=${INN_DATA_DIR}/http \ 43 --with-http-dir=${INN_DATA_DIR}/http \
45 --with-log-dir=${INN_DATA_DIR}/log \ 44 --with-log-dir=${INN_DATA_DIR}/log \
46 --with-run-dir=${INN_DATA_DIR}/run \ 45 --with-run-dir=${INN_DATA_DIR}/run \
47 --includedir=${PREFIX}/include \ 46 --includedir=${PREFIX}/include \
48 --with-spool-dir=${INN_SPOOL:Q} \ 47 --with-spool-dir=${INN_SPOOL:Q} \
49 --with-news-user=${INN_USER:Q} \ 48 --with-news-user=${INN_USER} \
50 --with-news-group=${INN_GROUP:Q} 49 --with-news-group=${INN_GROUP}
51CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK:Q} 50CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK}
52CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP:Q} 51CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP}
53CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED:Q} 52CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED}
54CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH:Q} 53CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH}
55CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT:Q} 54CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT}
56CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} 55CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD}
57USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc 56USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
58 57
59LDFLAGS.SunOS+= -lsocket -lnsl 58LDFLAGS.SunOS+= -lsocket -lnsl
60 59
61DEPENDS+= p5-MIME-tools>0:../../mail/p5-MIME-tools 60DEPENDS+= p5-MIME-tools>0:../../mail/p5-MIME-tools
62DEPENDS+= p5-GD>0:../../graphics/p5-GD 61DEPENDS+= p5-GD>0:../../graphics/p5-GD
63DEPENDS+= gnupg>0:../../security/gnupg 62DEPENDS+= gnupg>0:../../security/gnupg
64 63
65## Please note that USE_DESTDIR=yes only works for this package if the user 64## Please note that USE_DESTDIR=yes only works for this package if the user
66## and group already exist 65## and group already exist
67 66
68PKG_USERS_VARS+= INN_USER 67PKG_USERS_VARS+= INN_USER
69PKG_GROUPS_VARS+= INN_GROUP 68PKG_GROUPS_VARS+= INN_GROUP
@@ -112,74 +111,72 @@ CFILES= actsync.cfg actsync.ign buffin @@ -112,74 +111,72 @@ CFILES= actsync.cfg actsync.ign buffin
112 distrib.pats distributions \ 111 distrib.pats distributions \
113 expire.ctl incoming.conf inn.conf innfeed.conf \ 112 expire.ctl incoming.conf inn.conf innfeed.conf \
114 innreport.conf innwatch.ctl \ 113 innreport.conf innwatch.ctl \
115 localgroups moderators \ 114 localgroups moderators \
116 motd.news news2mail.cf newsfeeds nnrpd.track \ 115 motd.news news2mail.cf newsfeeds nnrpd.track \
117 nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \ 116 nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \
118 radius.conf readers.conf send-uucp.cf \ 117 radius.conf readers.conf send-uucp.cf \
119 storage.conf subscriptions 118 storage.conf subscriptions
120.for file in ${CFILES} 119.for file in ${CFILES}
121CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \ 120CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
122 ${INN_USER} ${INN_GROUP} 0664 121 ${INN_USER} ${INN_GROUP} 0664
123.endfor 122.endfor
124 123
125CONF_FILES_PERMS+= ${EXAMPLEDIR}/active.minimal ${INN_DATA_DIR}/db/active ${INN_USER} ${INN_GROUP} 0664 124CONF_FILES_PERMS+= ${EXAMPLEDIR}/active.minimal ${INN_DATA_DIR}/db/active ${INN_USER} ${INN_GROUP} 0664
126CONF_FILES_PERMS+= ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/newsgroups ${INN_USER} ${INN_GROUP} 0664 125CONF_FILES_PERMS+= ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/newsgroups ${INN_USER} ${INN_GROUP} 0664
127 126
128DBFILES= active.times history 127DBFILES= active.times history
129 128
130HTTPFILES= innreport.css 129HTTPFILES= innreport.css
131 130
132CONF_FILES_PERMS+= ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664 131CONF_FILES_PERMS+= ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664
133 132
134.for file in ${DBFILES} 133.for file in ${DBFILES}
135CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \ 134CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \
136 ${INN_USER} ${INN_GROUP} 0664 135 ${INN_USER} ${INN_GROUP} 0664
137.endfor 136.endfor
138 137
139RCD_SCRIPTS= innd 138RCD_SCRIPTS= innd
140 139
141PKG_DESTDIR_SUPPORT= destdir 140PKG_DESTDIR_SUPPORT= destdir
142 141
143.include "../../mk/bsd.prefs.mk" 142.include "../../mk/bsd.prefs.mk"
144 143
145.if ${OPSYS} == "SunOS" 144.if ${OPSYS} == "SunOS"
146CONFIGURE_ARGS+= --with-sendmail=/usr/lib/sendmail 145CONFIGURE_ARGS+= --with-sendmail=/usr/lib/sendmail
147.else 146.else
148CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail 147CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail
149.endif 148.endif
150 149
151.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 150.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
152GCC_REQD+= 2.95.3 151GCC_REQD+= 2.95.3
153.endif 152.endif
154 153
155.include "options.mk" 154.include "options.mk"
156 155
157pre-install: 156pre-install:
158 for FILE in ${CFILES} active.minimal newsgroups.minimal; do \ 157.for file in ${CFILES} active.minimal newsgroups.minimal
159 ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ 158 ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}
160 ${DESTDIR}${EXAMPLEDIR}; \ 159.endfor
161 done 160.for file in ${DBFILES} ${HTTPFILES}
162 for FILE in ${DBFILES} ${HTTPFILES}; do \ 161 ${TOUCH} ${WRKSRC}/site/${file}
163 ${TOUCH} ${WRKSRC}/site/$$FILE ; \ 162 ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}
164 ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ 163.endfor
165 ${DESTDIR}${EXAMPLEDIR}; \ 
166 done 
167 164
168post-install: 165post-install:
169 for FILE in cnfsstat ctlinnd makehistory innbind; do \ 166.for file in cnfsstat ctlinnd makehistory innbind
170 ${RM} -f ${DESTDIR}${PREFIX}/sbin/$$FILE ; \ 167 ${RM} -f ${DESTDIR}${PREFIX}/sbin/${file}
171 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/$$FILE \ 168 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/${file} \
172 ${DESTDIR}${PREFIX}/sbin ; \ 169 ${DESTDIR}${PREFIX}/sbin
173 done 170.endfor
174 ${RM} -f ${DESTDIR}${PREFIX}/sbin/inews ; 171 ${RM} -f ${DESTDIR}${PREFIX}/sbin/inews
175 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \ 172 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \
176 ${DESTDIR}${PREFIX}/bin 173 ${DESTDIR}${PREFIX}/bin
177 ${RM} -f ${DESTDIR}${PREFIX}/sbin/rnews ; 174 ${RM} -f ${DESTDIR}${PREFIX}/sbin/rnews
178 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \ 175 ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \
179 ${DESTDIR}${PREFIX}/bin 176 ${DESTDIR}${PREFIX}/bin
180 for FILE in libinn.a libstorage.a libinnhist.a ; do \ 177.for file in libinn.a libstorage.a libinnhist.a
181 ${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/$$FILE ; \ 178 ${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/${file}
182 done 179.endfor
183 180
184.include "../../security/openssl/buildlink3.mk" 181.include "../../security/openssl/buildlink3.mk"
185.include "../../mk/bsd.pkg.mk" 182.include "../../mk/bsd.pkg.mk"

cvs diff -r1.25 -r1.26 pkgsrc/news/inn/distinfo (expand / switch to unified diff)

--- pkgsrc/news/inn/distinfo 2010/01/16 09:46:16 1.25
+++ pkgsrc/news/inn/distinfo 2010/04/13 21:18:00 1.26
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.25 2010/01/16 09:46:16 spz Exp $ 1$NetBSD: distinfo,v 1.26 2010/04/13 21:18:00 spz Exp $
2 2
3SHA1 (inn-2.5.1.tar.gz) = e49a58a3484bbb7fd230b37ca17cc34eb10c10f1 3SHA1 (inn-2.5.2.tar.gz) = e7a9512acb5fa09ecdf116a4bde39c9f5efe65db
4RMD160 (inn-2.5.1.tar.gz) = 8cb24ac4fcea299b02b2b0b043a4f5506b902c47 4RMD160 (inn-2.5.2.tar.gz) = 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c
5Size (inn-2.5.1.tar.gz) = 2305406 bytes 5Size (inn-2.5.2.tar.gz) = 2331916 bytes
6SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8 6SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8
7SHA1 (patch-ab) = c48e442cc710f0655904c10031c2402e9dea7560 7SHA1 (patch-ab) = 5f98336273de9763c38df3bb122f141cbd16527a
8SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755 8SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755
9SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d 9SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d
10SHA1 (patch-ag) = ec28feef2392567cbc607e7b27fe85f1acd349a7 10SHA1 (patch-ag) = ec28feef2392567cbc607e7b27fe85f1acd349a7
11SHA1 (patch-ah) = 48c2440ed361668c934194e53dc91fe0fa24dc2f 11SHA1 (patch-ah) = 48c2440ed361668c934194e53dc91fe0fa24dc2f
12SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212 12SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212
13SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065 13SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065

cvs diff -r1.5 -r1.6 pkgsrc/news/inn/options.mk (expand / switch to unified diff)

--- pkgsrc/news/inn/options.mk 2009/12/16 22:10:25 1.5
+++ pkgsrc/news/inn/options.mk 2010/04/13 21:18:00 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2009/12/16 22:10:25 spz Exp $ 1# $NetBSD: options.mk,v 1.6 2010/04/13 21:18:00 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.inn 3PKG_OPTIONS_VAR= PKG_OPTIONS.inn
4PKG_SUPPORTED_OPTIONS= inet6 perl python uucp 4PKG_SUPPORTED_OPTIONS= inet6 perl python uucp
5PKG_SUGGESTED_OPTIONS= inet6 perl 5PKG_SUGGESTED_OPTIONS= inet6 perl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### IPv6 support 10### IPv6 support
11### 11###
12.if !empty(PKG_OPTIONS:Minet6) 12.if !empty(PKG_OPTIONS:Minet6)
13CONFIGURE_ARGS+= --enable-ipv6 13CONFIGURE_ARGS+= --enable-ipv6
14.endif 14.endif
@@ -28,18 +28,18 @@ CONFIGURE_ARGS+= --disable-uucp-rnews @@ -28,18 +28,18 @@ CONFIGURE_ARGS+= --disable-uucp-rnews
28### 28###
29.if !empty(PKG_OPTIONS:Mperl) 29.if !empty(PKG_OPTIONS:Mperl)
30CONFIGURE_ARGS+= --with-perl 30CONFIGURE_ARGS+= --with-perl
31CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q} 31CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q}
32 32
33.include "../../lang/perl5/buildlink3.mk" 33.include "../../lang/perl5/buildlink3.mk"
34.else 34.else
35CONFIGURE_ARGS+= --without-perl 35CONFIGURE_ARGS+= --without-perl
36.endif 36.endif
37### 37###
38### Python support for INN 38### Python support for INN
39### 39###
40.if !empty(PKG_OPTIONS:Mpython) 40.if !empty(PKG_OPTIONS:Mpython)
41CONFIGURE_ARGS+= --with-python 41CONFIGURE_ARGS+= --with-python
42CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q} 42CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q}
43 43
44.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
45.endif 45.endif

cvs diff -r1.9 -r1.10 pkgsrc/news/inn/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/news/inn/patches/patch-ab 2009/12/16 22:10:25 1.9
+++ pkgsrc/news/inn/patches/patch-ab 2010/04/13 21:18:00 1.10
@@ -1,37 +1,15 @@ @@ -1,37 +1,15 @@
1$NetBSD: patch-ab,v 1.9 2009/12/16 22:10:25 spz Exp $ 1$NetBSD: patch-ab,v 1.10 2010/04/13 21:18:00 spz Exp $
2 2
3--- scripts/news.daily.in.orig 2009-05-21 22:08:33.000000000 +0200 3--- scripts/news.daily.in.orig 2009-05-21 22:08:33.000000000 +0200
4+++ scripts/news.daily.in 4+++ scripts/news.daily.in
5@@ -232,17 +232,17 @@ then 
6 cd "${PATHSPOOL}/${INNFEEDSPOOL}" 
7  
8 # Find the PIDs of innfeed. 
9- LOCKS=`cat *.lock 2>/dev/null | ${SORT} -u` 
10+ INNFEEDLOCKS=`cat *.lock 2>/dev/null | ${SORT} -u` 
11  
12 # Process files like "innfeed-dropped.A001703" where 
13- # 1703 is not in $LOCKS. 
14+ # 1703 is not in $INNFEEDLOCKS. 
15 for file in `find . -name "innfeed-dropped*" -print` 
16 do 
17 PID=`echo "$file" | ${SED} 's/^.*[A-Z]0*//'` 
18 FOUND=false 
19- for LOCK in $LOCKS 
20+ for INNFEEDLOCK in $INNFEEDLOCKS 
21 do 
22- if [ "$PID" = "$LOCK" ] 
23+ if [ "$PID" = "$INNFEEDLOCK" ] 
24 then 
25 FOUND=true 
26 fi 
27@@ -256,6 +256,10 @@ fi 5@@ -256,6 +256,10 @@ fi
28  6
29 cd ${PATHETC} 7 cd ${PATHETC}
30  8
31+## Unlimit 9+## Unlimit
32+ulimit -d `ulimit -H -d` 10+ulimit -d `ulimit -H -d`
33+ulimit -n `ulimit -H -n` 11+ulimit -n `ulimit -H -n`
34+ 12+
35 ## Show the status of the news system. 13 ## Show the status of the news system.
36 ${DOSTAT} && { 14 ${DOSTAT} && {
37 ${INNSTAT} 15 ${INNSTAT}