Attachment 200759 Details for Bug 234586 – Patch set for www/foswiki

[patch] Patch set for www/foswiki

foswiki.diff (text/plain), 3.72 KB, created by Sam Chen on 2019-01-04 04:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Chen

Created: 2019-01-04 04:02:29 UTC

Size: 3.72 KB

patch

obsolete

>diff -ruN www/foswiki.orig/Makefile www/foswiki/Makefile
>--- www/foswiki.orig/Makefile	2018-07-07 10:30:07.000000000 -0400
>+++ www/foswiki/Makefile	2019-01-01 01:19:16.000000000 -0500
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	foswiki
> PORTVERSION=	2.1.6
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	SF
> DISTNAME=	Foswiki-${PORTVERSION}
>@@ -14,6 +15,10 @@
> 
> RUN_DEPENDS=	p5-Error>=0.15:lang/p5-Error \
> 		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
>+		p5-CGI>=3.15:www/p5-CGI \
>+		p5-Email-MIME>=1.903:mail/p5-Email-MIME \
>+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
>+		p5-JSON>=0:converters/p5-JSON \
> 		p5-Text-Diff>=0.35:textproc/p5-Text-Diff \
> 		p5-Sort-Maker>=0.06:devel/p5-Sort-Maker
> 
>@@ -72,6 +77,10 @@
> 		LocalLib.cfg
> 	@${FIND} ${WRKSRC} -name \*.orig -delete
> 
>+pre-install:
>+	@cd ${WRKSRC} && \
>+		${PERL} tools/rewriteshebang.pl -p ${PERL} -d ${WRKSRC}/bin -d ${WRKSRC}/tools --noask
>+
> post-install-APACHE-on:
> 	@${MKDIR} ${STAGEDIR}${CONFDIR}
> 	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
>diff -ruN www/foswiki.orig/bsd.foswiki.mk www/foswiki/bsd.foswiki.mk
>--- www/foswiki.orig/bsd.foswiki.mk	2017-01-20 08:02:33.000000000 -0500
>+++ www/foswiki/bsd.foswiki.mk	2018-12-29 22:11:00.000000000 -0500
>@@ -39,6 +39,7 @@
> SUB_LIST+=	FWDIR=${FWDIR} FIND=${FIND} CHMOD=${CHMOD} CHOWN=${CHOWN} \
> 		TOUCH=${TOUCH} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
> 		CONFDIR=${CONFDIR}
>+SUB_FILES+=	pkg-install
> MAINTAINER?=	glarkin@FreeBSD.org
> RUN_DEPENDS+=	${FWDEP:C/([^=<>]*)([=<>]*)(.*)/foswiki-\1\20.0.\3:www\/foswiki-\1/}
> 
>diff -ruN www/foswiki.orig/files/patch-tools_fix__file__permissions.sh www/foswiki/files/patch-tools_fix__file__permissions.sh
>--- www/foswiki.orig/files/patch-tools_fix__file__permissions.sh	1969-12-31 19:00:00.000000000 -0500
>+++ www/foswiki/files/patch-tools_fix__file__permissions.sh	2019-01-03 11:11:35.632545000 -0500
>@@ -0,0 +1,11 @@
>+--- tools/fix_file_permissions.sh.orig	2019-01-03 16:11:17 UTC
>++++ tools/fix_file_permissions.sh
>+@@ -6,7 +6,7 @@
>+ # servers, the "world" permissions should be removed, and the corresponding changes made to
>+ # the configuration variables listed below.
>+ 
>+-OPT=-c              # -c: Show changes.   On FreeBSD,  needs to be -vv
>++OPT=-vv             # -c: Show changes.   On FreeBSD,  needs to be -vv
>+ 
>+ ROOT=444            # Server root read only
>+ DIR=755             # Directories need "exec" for directory operations. Matches {Store}{dirPermission}
>diff -ruN www/foswiki.orig/files/pkg-install.in www/foswiki/files/pkg-install.in
>--- www/foswiki.orig/files/pkg-install.in	1969-12-31 19:00:00.000000000 -0500
>+++ www/foswiki/files/pkg-install.in	2018-12-31 20:08:59.000000000 -0500
>@@ -0,0 +1,25 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: head/www/twiki/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $
>+#
>+
>+FWDIR=%%FWDIR%%
>+WWWDIR=%%WWWDIR%%
>+WWWOWN=%%WWWOWN%%
>+WWWGRP=%%WWWGRP%%
>+
>+case $2 in
>+	PRE-INSTALL)
>+		;;
>+	POST-INSTALL)
>+		chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
>+
>+		cd ${WWWDIR}
>+		sh tools/fix_file_permissions.sh > /dev/null 2>&1
>+		;;
>+	*)
>+		echo "Unexpected Argument $2!!!"
>+		exit 1
>+		;;
>+esac
>+exit 0
>diff -ruN www/foswiki.orig/files/pkg-message-noapache.in www/foswiki/files/pkg-message-noapache.in
>--- www/foswiki.orig/files/pkg-message-noapache.in	2014-01-22 10:52:06.000000000 -0500
>+++ www/foswiki/files/pkg-message-noapache.in	2018-12-31 21:45:32.000000000 -0500
>@@ -2,6 +2,12 @@
> You have just installed Foswiki without configuring it for a specific
> web server.
> 
>+Path to foswiki: %%FWDIR%%
>+
> To complete the installation, please visit:
> http://foswiki.org/System/InstallationGuide
> 
>+Notes for Apache 2.4 users:
>+* Generate a new foswiki.conf for Apache 2.4:
>+    https://foswiki.org/Support.ApacheConfigGenerator
>+* Enable these DSO modules in httpd.conf: cgi_module, rewrite_module

Flags:

koobs: maintainer-approval? (portmaster)

Actions: View | Diff

Attachments on bug 234586: 200727 | 200728 | 200729 | 200730 | 200731 | 200733 | 200759