CVS commit: pkgsrc/security/zoneminder

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Jun 18 12:36:59 UTC 2019

Modified Files:
        pkgsrc/security/zoneminder: Makefile
        pkgsrc/security/zoneminder/files: zoneminder.conf

Log Message:
security/zoneminder: Update example apache config to 24


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/zoneminder/files/zoneminder.conf

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

Modified files:

Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.41 pkgsrc/security/zoneminder/Makefile:1.42
--- pkgsrc/security/zoneminder/Makefile:1.41    Tue Jun 18 12:33:43 2019
+++ pkgsrc/security/zoneminder/Makefile Tue Jun 18 12:36:59 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2019/06/18 12:33:43 gdt Exp $
+# $NetBSD: Makefile,v 1.42 2019/06/18 12:36:59 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/ZoneMinder-/zoneminder-/}
 DISTNAME=      ZoneMinder-1.28.1
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ZoneMinder/}
 GITHUB_PROJECT=        ZoneMinder

Index: pkgsrc/security/zoneminder/files/zoneminder.conf
diff -u pkgsrc/security/zoneminder/files/zoneminder.conf:1.1 pkgsrc/security/zoneminder/files/zoneminder.conf:1.2
--- pkgsrc/security/zoneminder/files/zoneminder.conf:1.1        Fri Mar 15 02:01:47 2013
+++ pkgsrc/security/zoneminder/files/zoneminder.conf    Tue Jun 18 12:36:59 2019
@@ -1,10 +1,13 @@
 # This Apache configuration puts ZoneMinder under /zm.
+# Access is limited to localhost, as a safe default until
+# intentionally changed.
 
 ScriptAlias /zm/cgi-bin/ "@ZM_HTTPD_CGIBIN@/"
 
 <Directory "@ZM_HTTPD_CGIBIN@">
-  Order allow,deny
-  Allow from all
+  <RequireAny>
+    Require ip 127.0.0.1
+  </RequireAny>
 </Directory>
 
 Alias /zm "@ZM_HTTPD_ROOT@"
@@ -13,6 +16,7 @@ Alias /zm "@ZM_HTTPD_ROOT@"
   php_flag register_globals off
   php_flag short_open_tag on
   DirectoryIndex index.php
-  Order allow,deny
-  Allow from all
+  <RequireAny>
+    Require ip 127.0.0.1
+  </RequireAny>
 </Directory>