- Update to 2.5.3 security release

- Remove outdated patches
- Preserve configured database during upgrade [1]

PR:		183614 [1]
Submitted by:	Horia Racoviceanu [1]

7 files changed, 42 insertions, 130 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index ebe1af1c01e5..8d9767c36056 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME?=	inn
-PORTVERSION?=	2.5.2
-PORTREVISION?=	3
+PORTVERSION?=	2.5.3
+PORTREVISION?=	0
 CATEGORIES=	news ipv6
 # Master distribution broken
-#MASTER_SITES?=	${MASTER_SITE_ISC}
-#MASTER_SITE_SUBDIR?=	${PORTNAME}
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fluffy
+MASTER_SITES?=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR?=	${PORTNAME}
+#MASTER_SITES=	${MASTER_SITE_LOCAL}
+#MASTER_SITE_SUBDIR=	fluffy
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
@@ -49,6 +49,7 @@ NO_STAGE=	yes
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=		ac_cv_prog_AWK="${AWK}"
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
 			--prefix=${INN_NEWSBASE}		\
 			--with-spool-dir=${INN_NEWSSPOOL}	\
@@ -133,7 +134,7 @@ PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
 HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
 
 MAN1=		convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
-		innfeed.1 innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \
+		innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \
 		shrinkfile.1 simpleftp.1 sm.1 pullnews.1
 MAN3=		INN::Config.3pm clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 \
 		libinnhist.3 libstorage.3 list.3 qio.3 tst.3 uwildmat.3
@@ -183,12 +184,6 @@ PLIST_SUB+=	ETCFILES="${CONFIG_FILES}"
 
 .include <bsd.port.pre.mk>
 
-# Perl 5.12 deprecated $[
-.if ${PERL_LEVEL} >= 501200
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-scripts_innreport.in \
-		${PATCHDIR}/extra-patch-scripts_innreport_inn.pm
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
 	                  ${WRKSRC}/site/Makefile
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 912dec5411e0..c577ebfe8b8a 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inn-2.5.2.tar.gz) = f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
-SIZE (inn-2.5.2.tar.gz) = 2331916
+SHA256 (inn-2.5.3.tar.gz) = 60f0042b144499680cc577a4330aeaac5dac20c5994649c0e945d32b5f8dbcf1
+SIZE (inn-2.5.3.tar.gz) = 2412119
diff --git a/news/inn/files/extra-patch-scripts_innreport.in b/news/inn/files/extra-patch-scripts_innreport.in
deleted file mode 100644
index a1573a52a5dc..000000000000
--- a/news/inn/files/extra-patch-scripts_innreport.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- scripts/innreport.in.orig	2012-03-14 01:02:54.000000000 +0800
-+++ scripts/innreport.in	2012-03-14 01:21:13.000000000 +0800
-@@ -674,7 +674,6 @@
- 
-   # $[ ... The index of the first element in an array, and of the first
-   #        character in a substring. Default is 0.
--  local $[ = 0;
- 
-   # The 2 dates are near. The range is less than a few days that's why we
-   # can cheat to determine the order. It is only important if one date
-@@ -791,7 +790,6 @@
- 
- # Compare 2 filenames
- sub filenamecmp {
--  local $[ = 0;
-   my ($la, $lb) = ($a, $b);
-   my ($ya) = $la =~ m/news-notice\.(\d+)\./o;
-   $ya += 100  if $ya < 90; # Try to pacify the year 2000 !
diff --git a/news/inn/files/extra-patch-scripts_innreport_inn.pm b/news/inn/files/extra-patch-scripts_innreport_inn.pm
deleted file mode 100644
index bbb4de57967a..000000000000
--- a/news/inn/files/extra-patch-scripts_innreport_inn.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/innreport_inn.pm.orig	2012-03-14 01:09:58.000000000 +0800
-+++ scripts/innreport_inn.pm	2012-03-14 01:17:41.000000000 +0800
-@@ -2197,7 +2197,7 @@
- # Compare 2 dates (+hour)
- sub datecmp {
-   # ex: "May 12 06"   for May 12, 6:00am
--  local($[) = 0;
-+
-   # The 2 dates are near. The range is less than a few days that's why we
-   # can cheat to determine the order. It is only important if one date
-   # is in January and the other in December.
diff --git a/news/inn/files/patch-configure b/news/inn/files/patch-configure
index a88a6aaa8058..3f59fc9a591a 100644
--- a/news/inn/files/patch-configure
+++ b/news/inn/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	2010-03-25 06:10:36.000000000 +1000
-+++ configure	2012-06-27 21:44:02.000000000 +1100
-@@ -15762,7 +15762,7 @@
- echo $ECHO_N "checking for Berkeley DB location... $ECHO_C" >&6; }
+--- configure.orig	2012-06-16 05:25:36.000000000 +1100
++++ configure	2013-11-18 02:00:26.831865533 +1100
+@@ -14595,7 +14595,7 @@
+ $as_echo_n "checking for Berkeley DB location... " >&6; }
      if test x"$DB_DIR" = xyes ; then
          for dir in $prefix /usr/local /usr ; do
 -            if test -f "$dir/include/db.h" ; then
@@ -9,15 +9,15 @@
                  DB_DIR=$dir
                  break
              fi
-@@ -15773,9 +15773,9 @@
- echo "$as_me: error: cannot find Berkeley DB" >&2;}
-    { (exit 1); exit 1; }; }
+@@ -14604,9 +14604,9 @@
+     if test x"$DB_DIR" = xyes ; then
+         as_fn_error $? "cannot find Berkeley DB" "$LINENO" 5
      else
 -        DB_CPPFLAGS="-I$DB_DIR/include"
 +        DB_CPPFLAGS="-I$DB_DIR/include/${DB_VER}"
          DB_LDFLAGS="-L$DB_DIR/lib"
 -        DB_LIBS="-ldb"
 +        DB_LIBS="-l${DB_LIB}"
-         { echo "$as_me:$LINENO: result: $DB_DIR" >&5
- echo "${ECHO_T}$DB_DIR" >&6; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DB_DIR" >&5
+ $as_echo "$DB_DIR" >&6; }
      fi
diff --git a/news/inn/files/patch-cve-2012-3523-minimal b/news/inn/files/patch-cve-2012-3523-minimal
deleted file mode 100644
index 3d166378a7a4..000000000000
--- a/news/inn/files/patch-cve-2012-3523-minimal
+++ /dev/null
@@ -1,61 +0,0 @@
-Fixes CVE-2012-3523.  This is a stripped down version of 2.5.2 -> 2.5.3
-patch that adds line_reset() to the relevant places.
-
-Obtained-from: ftp://ftp.isc.org/isc/inn/inn-2.5.2-2.5.3.diff.gz
-diff -Nurp inn-2.5.2/nnrpd/line.c inn-2.5.3/nnrpd/line.c
---- nnrpd/line.c	2010-03-24 13:10:36.000000000 -0700
-+++ nnrpd/line.c	2012-06-15 11:25:36.000000000 -0700
-@@ -66,6 +66,17 @@ line_init(struct line *line)
-     line->remaining = 0;
- }
- 
-+/*
-+**  Reset a line structure.
-+*/
-+void
-+line_reset(struct line *line)
-+{
-+    assert(line);
-+    line->where = line->start;
-+    line->remaining = 0;
-+}
-+
- /*
- **  Timeout is used only if HAVE_SSL is defined.
- */
-diff -Nurp inn-2.5.2/nnrpd/misc.c inn-2.5.3/nnrpd/misc.c
---- nnrpd/misc.c	2010-03-24 13:10:36.000000000 -0700
-+++ nnrpd/misc.c	2012-06-15 11:25:36.000000000 -0700
-@@ -518,5 +518,8 @@ CMDstarttls(int ac UNUSED, char *av[] UN
-         GRPcount = 0;
-         PERMgroupmadeinvalid = false;
-     }
-+
-+    /* Reset our read buffer so as to prevent plaintext command injection. */
-+    line_reset(&NNTPline);
- }
- #endif /* HAVE_SSL */
-diff -Nurp inn-2.5.2/nnrpd/nnrpd.h inn-2.5.3/nnrpd/nnrpd.h
---- nnrpd/nnrpd.h	2010-03-24 13:10:36.000000000 -0700
-+++ nnrpd/nnrpd.h	2012-06-15 11:25:36.000000000 -0700
-@@ -292,6 +292,7 @@ void PY_dynamic_init (char* file);
- 
- void line_free(struct line *);
- void line_init(struct line *);
-+void line_reset(struct line *);
- READTYPE line_read(struct line *, int, const char **, size_t *, size_t *);
- 
- #ifdef HAVE_SASL
-diff -Nurp inn-2.5.2/nnrpd/sasl.c inn-2.5.3/nnrpd/sasl.c
---- nnrpd/sasl.c	2010-03-24 13:10:36.000000000 -0700
-+++ nnrpd/sasl.c	2012-06-15 11:25:36.000000000 -0700
-@@ -326,6 +326,9 @@ SASLauth(int ac, char *av[])
-                 GRPcount = 0;
-                 PERMgroupmadeinvalid = false;
-             }
-+
-+            /* Reset our read buffer so as to prevent plaintext command injection. */
-+            line_reset(&NNTPline);
-         }
-     } else {
- 	/* Failure. */
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index cffa7beda9a8..9d4a83ac0000 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -161,6 +161,7 @@ lib/libinn.a
 lib/libinnhist.a
 lib/libstorage.a
 lib/perl/INN/Config.pm
+lib/perl/INN/Utils/Shlock.pm
 @comment --------------------------------------------------------------
 @cwd
 @exec mkdir -p %%DBDIR%%
@@ -201,10 +202,14 @@ lib/perl/INN/Config.pm
 %%EXAMPLESDIR%%/inn.conf
 %%EXAMPLESDIR%%/innfeed.conf
 %%EXAMPLESDIR%%/innreport.conf
+%%EXAMPLESDIR%%/innshellvars.local
+%%EXAMPLESDIR%%/innshellvars.pl.local
+%%EXAMPLESDIR%%/innshellvars.tcl.local
 %%EXAMPLESDIR%%/innwatch.ctl
 %%EXAMPLESDIR%%/localgroups
 %%EXAMPLESDIR%%/moderators
-%%EXAMPLESDIR%%/motd.news
+%%EXAMPLESDIR%%/motd.innd
+%%EXAMPLESDIR%%/motd.nnrpd
 %%EXAMPLESDIR%%/news2mail.cf
 %%EXAMPLESDIR%%/newsfeeds
 %%EXAMPLESDIR%%/nnrpd.track
@@ -222,7 +227,7 @@ lib/perl/INN/Config.pm
 @comment --------------------------------------------------------------
 @dirrm %%EXAMPLESDIR%%/db
 @dirrm %%EXAMPLESDIR%%
-@unexec rm -Rf %%TMPDIR%%                 2>/dev/null || true
+@unexec rmdir  %%TMPDIR%%                 2>/dev/null || true
 @unexec rmdir  %%SHAREDIR%%               2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/overview     2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/outgoing     2>/dev/null || true
@@ -231,21 +236,23 @@ lib/perl/INN/Config.pm
 @unexec rmdir  %%NEWSSPOOL%%/incoming     2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/articles     2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/archive      2>/dev/null || true
-@unexec rm -Rf %%NEWSSPOOL%%/tmp          2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%              2>/dev/null || true
-@unexec rm -Rf %%RUNDIR%%                 2>/dev/null || true
-@unexec rm -R  %%NEWSBASE%%/http
-@unexec rm -R  %%NEWSBASE%%/lib
-@unexec rm -R  %%NEWSBASE%%/include/inn
-@unexec rm -R  %%NEWSBASE%%/include
+@unexec rmdir  %%RUNDIR%%                 2>/dev/null || true
+@unexec rmdir  %%NEWSBASE%%/http
+@unexec rmdir  %%NEWSBASE%%/lib/perl/INN/Utils
+@unexec rmdir  %%NEWSBASE%%/lib/perl/INN
+@unexec rmdir  %%NEWSBASE%%/lib/perl
+@unexec rmdir  %%NEWSBASE%%/lib
+@unexec rmdir  %%NEWSBASE%%/include/inn
+@unexec rmdir  %%NEWSBASE%%/include
 @unexec rmdir  %%ETCDIR%%                 2>/dev/null || true
-@unexec rm -Rf %%NEWSBASE%%/doc
+@unexec rmdir  %%NEWSBASE%%/doc
 @unexec rmdir  %%DBDIR%%                  2>/dev/null || true
-@unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec
-@unexec rm -Rf %%NEWSBASE%%/bin/filter
-@unexec rm -Rf %%NEWSBASE%%/bin/control
-@unexec rm -Rf %%NEWSBASE%%/bin/auth/resolv
-@unexec rm -Rf %%NEWSBASE%%/bin/auth/passwd
-@unexec rm -Rf %%NEWSBASE%%/bin/auth
-@unexec rm -Rf %%NEWSBASE%%/bin
+@unexec rmdir  %%NEWSBASE%%/bin/rnews.libexec
+@unexec rmdir  %%NEWSBASE%%/bin/filter
+@unexec rmdir  %%NEWSBASE%%/bin/control
+@unexec rmdir  %%NEWSBASE%%/bin/auth/resolv
+@unexec rmdir  %%NEWSBASE%%/bin/auth/passwd
+@unexec rmdir  %%NEWSBASE%%/bin/auth
+@unexec rmdir  %%NEWSBASE%%/bin
 @unexec rmdir %%NEWSBASE%% 2>/dev/null ||( echo "===>  If you don't plan to use inn later, you can safely remove %%NEWSBASE%%. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo "    - $i"; done)