CVS commit: pkgsrc/www/ikiwiki

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep  1 02:19:38 UTC 2019

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

Log Message:
Replace unportable su(1) usage with sudo(8). Fix a few perl paths broken
in previous. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 pkgsrc/www/ikiwiki/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/www/ikiwiki/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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/Makefile
diff -u pkgsrc/www/ikiwiki/Makefile:1.166 pkgsrc/www/ikiwiki/Makefile:1.167
--- pkgsrc/www/ikiwiki/Makefile:1.166   Sat Aug 31 21:32:13 2019
+++ pkgsrc/www/ikiwiki/Makefile Sun Sep  1 02:19:37 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.166 2019/08/31 21:32:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.167 2019/09/01 02:19:37 schmonz Exp $
 #
 
 DISTNAME=              ikiwiki_3.20190228.orig
 PKGNAME=               ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=          .tar.xz
@@ -38,7 +38,8 @@ PERL5_PACKLIST=               auto/IkiWiki/.packlist
 USE_TOOLS+=            gmake msgfmt perl:run xgettext
 
 REPLACE_PYTHON+=       plugins/proxy.py plugins/pythondemo plugins/rst
-REPLACE_PERL+=         pm_filter
+REPLACE_PERL+=         pm_filter ikiwiki.in ikiwiki-comment.in
+REPLACE_PERL+=         ikiwiki-transition.in ikiwiki-calendar.in
 
 MAKE_FLAGS+=           W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
 MAKE_FLAGS+=           SYSCONFDIR=${PKG_SYSCONFDIR:Q}

Index: pkgsrc/www/ikiwiki/distinfo
diff -u pkgsrc/www/ikiwiki/distinfo:1.135 pkgsrc/www/ikiwiki/distinfo:1.136
--- pkgsrc/www/ikiwiki/distinfo:1.135   Sat Aug 31 21:32:13 2019
+++ pkgsrc/www/ikiwiki/distinfo Sun Sep  1 02:19:37 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.135 2019/08/31 21:32:13 schmonz Exp $
+$NetBSD: distinfo,v 1.136 2019/09/01 02:19:37 schmonz Exp $
 
 SHA1 (ikiwiki_3.20190228.orig.tar.xz) = 46f5b0a1498c1e098fe248eae1f2e3f56b25dc2f
 RMD160 (ikiwiki_3.20190228.orig.tar.xz) = f47968a69528aea864ad412c8508a8c5063edb9d
@@ -6,5 +6,5 @@ SHA512 (ikiwiki_3.20190228.orig.tar.xz) 
 Size (ikiwiki_3.20190228.orig.tar.xz) = 2672244 bytes
 SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 14a2d8e1d3eb671863cdef4a936ebbb7b09ce3b9
 SHA1 (patch-Makefile.PL) = 44324917c22ec3cd2aa216439e2ae5a3dc2f9787
-SHA1 (patch-ikiwiki-mass-rebuild) = b8d5785d77736508de9cfc0f059cc36e0e607bce
+SHA1 (patch-ikiwiki-mass-rebuild) = eb03ac0ec83078be593f76968f5a1f9080ea50b9
 SHA1 (patch-po_Makefile) = 468b500da41c606c6af6b65c8080d692acb69336

Index: pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild
diff -u pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild:1.1 pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild:1.2
--- pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild:1.1   Thu Mar 22 17:08:31 2018
+++ pkgsrc/www/ikiwiki/patches/patch-ikiwiki-mass-rebuild       Sun Sep  1 02:19:38 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-ikiwiki-mass-rebuild,v 1.1 2018/03/22 17:08:31 schmonz Exp $
+$NetBSD: patch-ikiwiki-mass-rebuild,v 1.2 2019/09/01 02:19:38 schmonz Exp $
 
-Attempt to make su(1) usage more portable.
+Replace unportable su(1) usage with sudo(8).
 
---- ikiwiki-mass-rebuild.orig  2018-03-11 15:54:34.000000000 +0000
+--- ikiwiki-mass-rebuild.orig  2019-02-26 23:01:54.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'");
++      my $ret=system("sudo", "-n", "-s", "-u", $user, "/bin/sh", "-c", "--", "$0", "--nonglobal", @ARGV);
        if ($ret != 0) {
                print STDERR "warning: processing for $user failed with code $ret\n";
        }