Sun Sep 27 07:17:58 2015 UTC ()
Tweak geeklog.conf to support mod_authz_core as well as mod_authz_core.


(taca)
diff -r1.41 -r1.42 pkgsrc/www/geeklog/Makefile
diff -r1.2 -r1.3 pkgsrc/www/geeklog/files/geeklog.conf
cvs diff -r1.41 -r1.42 pkgsrc/www/geeklog/Makefile (expand / switch to unified diff)

--- pkgsrc/www/geeklog/Makefile 2015/07/06 11:49:54 1.41
+++ pkgsrc/www/geeklog/Makefile 2015/09/27 07:17:58 1.42
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.41 2015/07/06 11:49:54 taca Exp $ 1# $NetBSD: Makefile,v 1.42 2015/09/27 07:17:58 taca Exp $
2# 2#
3 3
4DISTNAME= geeklog-${VER} 4DISTNAME= geeklog-${VER}
5PKGNAME= geeklog-${VER:C/(sr|-)/./g} 5PKGNAME= geeklog-${VER:C/(sr|-)/./g}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= https://www.geeklog.net/filemgmt/upload_dir/ 8MASTER_SITES= https://www.geeklog.net/filemgmt/upload_dir/
9 9
10MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
11HOMEPAGE= https://www.geeklog.net/ 11HOMEPAGE= https://www.geeklog.net/
12COMMENT= PHP/MySQL based application for managing dynamic web content 12COMMENT= PHP/MySQL based application for managing dynamic web content
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php 15DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
16DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql 16DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql
17 17
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19 19
cvs diff -r1.2 -r1.3 pkgsrc/www/geeklog/files/geeklog.conf (expand / switch to unified diff)

--- pkgsrc/www/geeklog/files/geeklog.conf 2009/05/26 14:19:29 1.2
+++ pkgsrc/www/geeklog/files/geeklog.conf 2015/09/27 07:17:58 1.3
@@ -1,12 +1,17 @@ @@ -1,12 +1,17 @@
1# $NetBSD: geeklog.conf,v 1.2 2009/05/26 14:19:29 taca Exp $ 1# $NetBSD: geeklog.conf,v 1.3 2015/09/27 07:17:58 taca Exp $
2# 2#
3 3
4Alias /geeklog "@PREFIX@/@GEEKLOG_PUB@" 4Alias /geeklog "@PREFIX@/@GEEKLOG_PUB@"
5 5
6<Directory "@PREFIX@/@GEEKLOG_PUB@"> 6<Directory "@PREFIX@/@GEEKLOG_PUB@">
7 DirectoryIndex index.php index.html 7 DirectoryIndex index.php index.html
8 Options Indexes 8 Options Indexes
9 AllowOverride None 9 AllowOverride None
 10<IfModule !mod_authz_core.c>
10 Order allow,deny 11 Order allow,deny
11 Allow from localhost 12 Allow from localhost
 13</IfModule>
 14<IfModule mod_authz_core.c>
 15 Require all granted
 16</IfModule>
12</Directory> 17</Directory>