Attachment 82099 Details for Bug 117482 – ikiwiki.patch

[patch] ikiwiki.patch

ikiwiki.patch (text/plain), 3.50 KB, created by Henrik Brix Andersen on 2007-10-25 13:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henrik Brix Andersen

Created: 2007-10-25 13:10:01 UTC

Size: 3.50 KB

patch

obsolete

>diff -urpN /usr/ports/www/ikiwiki/Makefile www/ikiwiki/Makefile
>--- /usr/ports/www/ikiwiki/Makefile	2007-10-06 16:42:39.000000000 +0200
>+++ www/ikiwiki/Makefile	2007-10-25 13:45:49.000000000 +0200
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/www/ikiwiki/Makefile,v 1.10 2007/10/06 14:42:39 miwi Exp $
> 
> PORTNAME=	ikiwiki
>-PORTVERSION=	2.9
>+PORTVERSION=	2.10
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>@@ -54,6 +54,12 @@ post-patch:
> 	@${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
> 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
> 	@${REINPLACE_CMD} \
>+		-e "s|/usr/local|${LOCALBASE}|" \
>+		-e "s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \
>+		${WRKSRC}/ikiwiki-mass-rebuild
>+	@${REINPLACE_CMD} -e "s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \
>+		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn
>+	@${REINPLACE_CMD} \
> 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
> 		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
> 		${WRKSRC}/Makefile.PL
>diff -urpN /usr/ports/www/ikiwiki/distinfo www/ikiwiki/distinfo
>--- /usr/ports/www/ikiwiki/distinfo	2007-10-06 16:42:39.000000000 +0200
>+++ www/ikiwiki/distinfo	2007-10-25 13:00:36.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (ikiwiki_2.9.tar.gz) = b241a44749a2785babe9c2f662ab6c9d
>-SHA256 (ikiwiki_2.9.tar.gz) = cf0493296266b138e827fb46bd2dd713088bffd72c72d501ebdee95578c9d965
>-SIZE (ikiwiki_2.9.tar.gz) = 553080
>+MD5 (ikiwiki_2.10.tar.gz) = d0c350f9866f206363c3ba021ee7cce9
>+SHA256 (ikiwiki_2.10.tar.gz) = 02b59a06b48d280e5b8f811c377be4a65475c3bfbf6d15569edb3333ec80b7cb
>+SIZE (ikiwiki_2.10.tar.gz) = 564841
>diff -urpN /usr/ports/www/ikiwiki/files/patch-ikiwiki-mass-rebuild www/ikiwiki/files/patch-ikiwiki-mass-rebuild
>--- /usr/ports/www/ikiwiki/files/patch-ikiwiki-mass-rebuild	1970-01-01 01:00:00.000000000 +0100
>+++ www/ikiwiki/files/patch-ikiwiki-mass-rebuild	2007-10-25 13:05:08.000000000 +0200
>@@ -0,0 +1,18 @@
>+--- ikiwiki-mass-rebuild.orig	2007-08-15 22:21:59.000000000 +0200
>++++ ikiwiki-mass-rebuild	2007-10-25 13:04:10.000000000 +0200
>+@@ -22,13 +22,14 @@ sub processline {
>+ 		my ($uuid, $ugid) = (getpwnam($user))[2, 3];
>+ 		$)="$ugid $ugid";
>+ 		$(=$ugid;
>+-		$>=$uuid;
>+ 		$<=$uuid;
>++		$>=$uuid;
>+ 		if ($< != $uuid || $> != $uuid || $( != $ugid || $) ne "$ugid $ugid") {
>+ 			die "failed to drop permissions to $user";
>+ 		}
>+ 		%ENV=();
>+ 		$ENV{HOME}=(getpwnam($user))[7];
>++		$ENV{PATH}="/usr/bin:/usr/local/bin";
>+ 		exec("ikiwiki", "-setup", $setup, @ARGV);
>+ 		die "failed to run ikiwiki: $!";
>+ 	}
>Files /usr/ports/www/ikiwiki/ikiwiki-2.10.tbz and www/ikiwiki/ikiwiki-2.10.tbz differ
>diff -urpN /usr/ports/www/ikiwiki/pkg-plist www/ikiwiki/pkg-plist
>--- /usr/ports/www/ikiwiki/pkg-plist	2007-09-23 11:16:56.000000000 +0200
>+++ www/ikiwiki/pkg-plist	2007-10-25 13:03:23.000000000 +0200
>@@ -109,7 +109,6 @@
> %%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm
> %%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm
> %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
>-%%SITE_PERL%%/IkiWiki/Plugin/rst.pm
> %%SITE_PERL%%/IkiWiki/Plugin/search.pm
> %%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm
> %%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm
>@@ -140,10 +139,12 @@
> %%SITE_PERL%%/IkiWiki/Wrapper.pm
> bin/ikiwiki
> lib/ikiwiki/plugins/externaldemo
>+lib/ikiwiki/plugins/rst
> %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
> sbin/ikiwiki-mass-rebuild
> share/locale/bg/LC_MESSAGES/ikiwiki.mo
> share/locale/cs/LC_MESSAGES/ikiwiki.mo
>+share/locale/da/LC_MESSAGES/ikiwiki.mo
> share/locale/es/LC_MESSAGES/ikiwiki.mo
> share/locale/fr/LC_MESSAGES/ikiwiki.mo
> share/locale/gu/LC_MESSAGES/ikiwiki.mo

Actions: View | Diff

Attachments on bug 117482: 82099