/[smecontribs]/rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz10347-bz4564-bz5337.patch
ViewVC logotype

Diff of /rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz10347-bz4564-bz5337.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Tue Mar 2 17:09:11 2021 UTC Revision 1.3 by jpp, Tue Mar 2 20:39:34 2021 UTC
# Line 1  Line 1 
 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");  
 +  
1  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  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
2  --- 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.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays   2021-02-28 22:41:40.846000000 -0500
3  +++ 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  +++ 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
# Line 24  diff -Nur smeserver-mod_dav-1.1.old/root Line 12  diff -Nur smeserver-mod_dav-1.1.old/root
12           my %properties = $ibay->props;           my %properties = $ibay->props;
13           my $key = $ibay->key;           my $key = $ibay->key;
14  +       my $dynamicContent = $properties{'CgiBin'} || "disabled";  +       my $dynamicContent = $properties{'CgiBin'} || "disabled";
15  +        my $secureEXEC = $properties{'ModDAVsecureEXEC'} || 'enabled';  +        my $secureEXEC = $properties{'ModDavsecureEXEC'} || 'enabled';
16  +        my $access = $properties{'PublicAccess'} || 'none';  +        my $access = $properties{'PublicAccess'} || 'none';
17  +       $OUT .= "\n    # ibay $key disabled for httpd so no DAV access\n" if $access eq 'none';  +       $OUT .= "\n    # ibay $key disabled for httpd so no DAV access\n" if $access eq 'none';
18  +       next if $access eq 'none';  +       next if $access eq 'none';
# Line 51  diff -Nur smeserver-mod_dav-1.1.old/root Line 39  diff -Nur smeserver-mod_dav-1.1.old/root
39  +                 $OUT .= "    <FilesMatch \\.php\$>\n";                  +                 $OUT .= "    <FilesMatch \\.php\$>\n";                
40  +                 $OUT .= "        #disabling php\n";  +                 $OUT .= "        #disabling php\n";
41  +                  $OUT .= "        SetHandler !\n"; # could use also SetHandler  none  +                  $OUT .= "        SetHandler !\n"; # could use also SetHandler  none
42  +                 $OUT .= "        deny from all\n" if ( $properties{'ModDAVhidephp'} || 'enabled' ) eq 'enabled';  +                 $OUT .= "        deny from all\n" if ( $properties{'ModDavHidephp'} || 'enabled' ) eq 'enabled';
43  +                  $OUT .= "    </FilesMatch>\n";                +                  $OUT .= "    </FilesMatch>\n";              
44  +                  $OUT .= "    Options -ExecCGI\n";  +                  $OUT .= "    Options -ExecCGI\n";
45  +                 $OUT .= "    RemoveHandler .cgi .php .php3 .php4 .php5 .phtml .pl .py .pyc .pyo\n";  +                 $OUT .= "    RemoveHandler .cgi .php .php3 .php4 .php5 .phtml .pl .py .pyc .pyo\n";
# Line 113  diff -Nur smeserver-mod_dav-1.1.old/root Line 101  diff -Nur smeserver-mod_dav-1.1.old/root
101  +  +
102  +                # 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  +                # 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
103  +                $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 .= "    #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";
104  +                $OUT .= "    DirectoryIndex disabled\n\n" unless ( ($properties{'DavNoDirectoryIndex'}||"enabled" ) eq "disabled");  +                $OUT .= "    DirectoryIndex disabled\n\n" unless ( ($properties{'ModDavNoDirectoryIndex'}||"enabled" ) eq "disabled");
105  +                $OUT .= "    #DirectoryIndex disabled : DavNoDirectoryIndex has been defined to force DirectoryIndex \n\n" if ( ($properties{'DavNoDirectoryIndex'}||"enabled" ) eq "disabled");  +                $OUT .= "    #DirectoryIndex disabled : DavNoDirectoryIndex has been defined to force DirectoryIndex \n\n" if ( ($properties{'ModDavNoDirectoryIndex'}||"enabled" ) eq "disabled");
106  +  +
107  +                $OUT .= "    order deny,allow\n";  +                $OUT .= "    order deny,allow\n";
108  +                $OUT .= "    deny from all\n";  +                $OUT .= "    deny from all\n";
# Line 212  diff -Nur smeserver-mod_dav-1.1.old/root Line 200  diff -Nur smeserver-mod_dav-1.1.old/root
200  +    my $accessMode = $properties{'UserAccess'} || 'wr-admin-rd-group';  +    my $accessMode = $properties{'UserAccess'} || 'wr-admin-rd-group';
201  +    my $access = $properties{'PublicAccess'} || 'none';  +    my $access = $properties{'PublicAccess'} || 'none';
202  +    my $ispassibay = $access =~ /-pw/;  +    my $ispassibay = $access =~ /-pw/;
203  +    my $Anonymous  =  $properties{'ModDavAnonymousRead'} || "enabled";  +    my $Anonymous  =  $properties{'ModDavAnonymousRead'} || "disabled";
204  +    my $MEMBERS = getMembers( $key, $iBayGroup);  +    my $MEMBERS = getMembers( $key, $iBayGroup);
205  +    my $REQUIRE = "";  +    my $REQUIRE = "";
206  +    if ($mode eq "read")  +    if ($mode eq "read")

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed