INN commit: branches/2.5 (3 files)

INN Commit rra at isc.org
Thu Sep 11 11:28:49 UTC 2014


    Date: Thursday, September 11, 2014 @ 04:28:49
  Author: iulius
Revision: 9689

innupgrade:  fix its execution

On a few systems like AIX, innupgrade failed to run during
an upgrade because "perl -T" was not explicitly called.
Failure was:
  "-T" is on the #! line, it must also be used on the command line

Thanks to The Doctor for his bug report.

Modified:
  branches/2.5/Makefile
  branches/2.5/doc/pod/news.pod
  branches/2.5/tests/util/innupgrade.t

-------------------------+
 Makefile                |   18 +++++++++---------
 doc/pod/news.pod        |    6 ++++++
 tests/util/innupgrade.t |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2014-09-11 11:28:00 UTC (rev 9688)
+++ Makefile	2014-09-11 11:28:49 UTC (rev 9689)
@@ -112,15 +112,15 @@
 	    echo '' ; \
 	    cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
 	done
-	test -z "$D" && $(PATHBIN)/innupgrade $(PATHAUTHPASSWD)
-	test -z "$D" && $(PATHBIN)/innupgrade $(PATHBIN)
-	test -z "$D" && $(PATHBIN)/innupgrade $(PATHDOC)
-	test -z "$D" && $(PATHBIN)/innupgrade $(PATHETC)
-	test -z "$D" && $(PATHBIN)/innupgrade ${PATHFILTER}
-	test -z "$D" && $(PATHBIN)/innupgrade $(MAN1)
-	test -z "$D" && $(PATHBIN)/innupgrade $(MAN3)
-	test -z "$D" && $(PATHBIN)/innupgrade $(MAN5)
-	test -z "$D" && $(PATHBIN)/innupgrade $(MAN8)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHAUTHPASSWD)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHBIN)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHDOC)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHETC)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade ${PATHFILTER}
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN1)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN3)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN5)
+	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN8)
 
 install-root:
 	@chmod +x support/install-sh

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2014-09-11 11:28:00 UTC (rev 9688)
+++ doc/pod/news.pod	2014-09-11 11:28:49 UTC (rev 9689)
@@ -13,6 +13,12 @@
 
 =item *
 
+Fixed how B<innupgrade> is executed during an update of an INN
+installation; on a few systems like AIX, it fails to run because its
+taint mode was unproperly declared.
+
+=item *
+
 Several improvements have been contributed to B<pullnews> by Geraint
 Edwards:  the new B<-a> flag adds the Diablo-compatible hashfeed
 ability, the new B<-B> flag triggers header-only feeding, the B<-m>

Modified: tests/util/innupgrade.t
===================================================================
--- tests/util/innupgrade.t	2014-09-11 11:28:00 UTC (rev 9688)
+++ tests/util/innupgrade.t	2014-09-11 11:28:49 UTC (rev 9689)
@@ -13,7 +13,7 @@
 
 # Run innupgrade with the given arguments and expect it to succeed.
 run () {
-    $innupgrade "$@"
+    perl -Tw ${innupgrade} "$@"
     if [ $? = 0 ] ; then
         printcount "ok"
     else



More information about the inn-committers mailing list