CVS commit: pkgsrc/www/ikiwiki

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Mar 22 17:08:31 UTC 2018

Modified Files:
        pkgsrc/www/ikiwiki: MESSAGE Makefile distinfo
Added Files:
        pkgsrc/www/ikiwiki/patches: patch-ikiwiki-mass-rebuild

Log Message:
Attempt to make su(1) usage more portable. Remove very old text from
MESSAGE. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ikiwiki/MESSAGE
cvs rdiff -u -r1.155 -r1.156 pkgsrc/www/ikiwiki/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/www/ikiwiki/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ikiwiki/MESSAGE
diff -u pkgsrc/www/ikiwiki/MESSAGE:1.8 pkgsrc/www/ikiwiki/MESSAGE:1.9
--- pkgsrc/www/ikiwiki/MESSAGE:1.8      Tue Apr 27 13:15:46 2010
+++ pkgsrc/www/ikiwiki/MESSAGE  Thu Mar 22 17:08:31 2018
@@ -1,10 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2010/04/27 13:15:46 schmonz Exp $
+$NetBSD: MESSAGE,v 1.9 2018/03/22 17:08:31 schmonz Exp $
 
 For a new wiki, see <URL:http://ikiwiki.info/setup/>.
 
 If you use custom templates, make sure they are correct when upgrading.
-
-All wikis need to be rebuilt on upgrade to 3.20100427. If you listed your
-wiki in ${PKG_SYSCONFDIR}/wikilist, simply run ikiwiki-mass-rebuild.
 ===========================================================================

Index: pkgsrc/www/ikiwiki/Makefile
diff -u pkgsrc/www/ikiwiki/Makefile:1.155 pkgsrc/www/ikiwiki/Makefile:1.156
--- pkgsrc/www/ikiwiki/Makefile:1.155   Sun Mar 11 22:57:55 2018
+++ pkgsrc/www/ikiwiki/Makefile Thu Mar 22 17:08:31 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.155 2018/03/11 22:57:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.156 2018/03/22 17:08:31 schmonz Exp $
 #
 
 DISTNAME=              ikiwiki_3.20180311.orig
 PKGNAME=               ${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=           1
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=          .tar.xz
@@ -51,8 +52,6 @@ EGDIR=                        ${PREFIX}/share/examples/${PKGB
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-#SPECIAL_PERMS+=               ${PREFIX}/bin/ikiwiki-update-wikilist ...
-
 TEST_TARGET=           test
 
 maintainer-find-default-perl-shebangs-not-substed:

Index: pkgsrc/www/ikiwiki/distinfo
diff -u pkgsrc/www/ikiwiki/distinfo:1.127 pkgsrc/www/ikiwiki/distinfo:1.128
--- pkgsrc/www/ikiwiki/distinfo:1.127   Sun Mar 11 22:57:55 2018
+++ pkgsrc/www/ikiwiki/distinfo Thu Mar 22 17:08:31 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.127 2018/03/11 22:57:55 schmonz Exp $
+$NetBSD: distinfo,v 1.128 2018/03/22 17:08:31 schmonz Exp $
 
 SHA1 (ikiwiki_3.20180311.orig.tar.xz) = 9c567bb9f46e8a86a41ddc2358d0426248934e33
 RMD160 (ikiwiki_3.20180311.orig.tar.xz) = 22a2f1963e73fae82a7a6a29c84488c898c7c4fa
 SHA512 (ikiwiki_3.20180311.orig.tar.xz) = 12042d90217995eb43d47df1e81cbced825fc2b2262893680447448abac88ef5279bcddd6c438613b41c4f35308a4f1e8d23157e018bb99d883bc0941af1d469
 Size (ikiwiki_3.20180311.orig.tar.xz) = 2639052 bytes
+SHA1 (patch-ikiwiki-mass-rebuild) = b8d5785d77736508de9cfc0f059cc36e0e607bce

Added files:

Index: pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild
diff -u /dev/null pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild:1.1
--- /dev/null   Thu Mar 22 17:08:31 2018
+++ pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild       Thu Mar 22 17:08:31 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-ikiwiki-mass-rebuild,v 1.1 2018/03/22 17:08:31 schmonz Exp $
+
+Attempt to make su(1) usage more portable.
+
+--- ikiwiki-mass-rebuild.orig  2018-03-11 15:54:34.000000000 +0000
++++ ikiwiki-mass-rebuild
+@@ -32,7 +32,7 @@ sub processuser {
+       my $user=shift;
+       return if $user=~/^-/ || $users{$user};
+       $users{$user}=1;
+-      my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV");
++      my $ret=system("su", "-", $user, "-c", "/bin/sh -c -- '$0 --nonglobal @ARGV'");
+       if ($ret != 0) {
+               print STDERR "warning: processing for $user failed with code $ret\n";
+       }