--- rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz10347-bz4564-bz5337.patch 2021/03/02 17:09:11 1.1 +++ rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz10347-bz4564-bz5337.patch 2021/03/02 20:39:34 1.3 @@ -1,15 +1,3 @@ -diff -Nur smeserver-mod_dav-1.1.old/createlinks smeserver-mod_dav-1.1/createlinks ---- smeserver-mod_dav-1.1.old/createlinks 1969-12-31 19:00:00.000000000 -0500 -+++ smeserver-mod_dav-1.1/createlinks 2021-02-28 23:12:35.438000000 -0500 -@@ -0,0 +1,8 @@ -+#!/usr/bin/perl -w -+ -+use esmith::Build::CreateLinks qw(:all); -+ -+my $event = "smeserver-mod_dav-update"; -+templates2events("/etc/httpd/conf/httpd.conf", $event); -+safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); -+ diff -Nur smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays --- smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays 2021-02-28 22:41:40.846000000 -0500 +++ smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays 2021-03-02 11:57:52.069000000 -0500 @@ -24,7 +12,7 @@ diff -Nur smeserver-mod_dav-1.1.old/root my %properties = $ibay->props; my $key = $ibay->key; + my $dynamicContent = $properties{'CgiBin'} || "disabled"; -+ my $secureEXEC = $properties{'ModDAVsecureEXEC'} || 'enabled'; ++ my $secureEXEC = $properties{'ModDavsecureEXEC'} || 'enabled'; + my $access = $properties{'PublicAccess'} || 'none'; + $OUT .= "\n # ibay $key disabled for httpd so no DAV access\n" if $access eq 'none'; + next if $access eq 'none'; @@ -51,7 +39,7 @@ diff -Nur smeserver-mod_dav-1.1.old/root + $OUT .= " \n"; + $OUT .= " #disabling php\n"; + $OUT .= " SetHandler !\n"; # could use also SetHandler none -+ $OUT .= " deny from all\n" if ( $properties{'ModDAVhidephp'} || 'enabled' ) eq 'enabled'; ++ $OUT .= " deny from all\n" if ( $properties{'ModDavHidephp'} || 'enabled' ) eq 'enabled'; + $OUT .= " \n"; + $OUT .= " Options -ExecCGI\n"; + $OUT .= " RemoveHandler .cgi .php .php3 .php4 .php5 .phtml .pl .py .pyc .pyo\n"; @@ -113,8 +101,8 @@ diff -Nur smeserver-mod_dav-1.1.old/root + + # bug with httpd-2.4 fixed in httpd-2.5 only see https://bz.apache.org/bugzilla/show_bug.cgi?id=54914 PROPFIND will fail + $OUT .= " #because of bug https://bz.apache.org/bugzilla/show_bug.cgi?id=54914 in httpd 2.4 DirectoryIndex disabled is needed for webdav to work\n"; -+ $OUT .= " DirectoryIndex disabled\n\n" unless ( ($properties{'DavNoDirectoryIndex'}||"enabled" ) eq "disabled"); -+ $OUT .= " #DirectoryIndex disabled : DavNoDirectoryIndex has been defined to force DirectoryIndex \n\n" if ( ($properties{'DavNoDirectoryIndex'}||"enabled" ) eq "disabled"); ++ $OUT .= " DirectoryIndex disabled\n\n" unless ( ($properties{'ModDavNoDirectoryIndex'}||"enabled" ) eq "disabled"); ++ $OUT .= " #DirectoryIndex disabled : DavNoDirectoryIndex has been defined to force DirectoryIndex \n\n" if ( ($properties{'ModDavNoDirectoryIndex'}||"enabled" ) eq "disabled"); + + $OUT .= " order deny,allow\n"; + $OUT .= " deny from all\n"; @@ -212,7 +200,7 @@ diff -Nur smeserver-mod_dav-1.1.old/root + my $accessMode = $properties{'UserAccess'} || 'wr-admin-rd-group'; + my $access = $properties{'PublicAccess'} || 'none'; + my $ispassibay = $access =~ /-pw/; -+ my $Anonymous = $properties{'ModDavAnonymousRead'} || "enabled"; ++ my $Anonymous = $properties{'ModDavAnonymousRead'} || "disabled"; + my $MEMBERS = getMembers( $key, $iBayGroup); + my $REQUIRE = ""; + if ($mode eq "read")