--- rpms/smeserver-webshare/contribs10/smeserver-webshare-1.0.0-sme10-backup.patch 2022/08/02 03:52:06 1.2 +++ rpms/smeserver-webshare/contribs10/smeserver-webshare-1.0.0-sme10-backup.patch 2022/08/02 04:06:37 1.4 @@ -1,15 +1,25 @@ diff -Nur --no-dereference smeserver-webshare-1.0.0.old/createlinks smeserver-webshare-1.0.0/createlinks --- smeserver-webshare-1.0.0.old/createlinks 2002-05-05 22:44:40.000000000 -0400 -+++ smeserver-webshare-1.0.0/createlinks 2022-08-01 23:51:24.447000000 -0400 -@@ -2,6 +2,7 @@ ++++ smeserver-webshare-1.0.0/createlinks 2022-08-01 23:57:14.361000000 -0400 +@@ -2,20 +2,25 @@ # This script creates the symlinks needed by this RPM # Specific support exists to create symlinks within e-smith web "panels" # and for links from named "events" directories into the "actions" directory +- +-sub panel_link +-{ +- my ($function, $panel) = @_; +- +- unlink "root/etc/e-smith/web/panels/$panel/cgi-bin/$function"; +- symlink("../../../functions/$function", +- "root/etc/e-smith/web/panels/$panel/cgi-bin/$function") +- or die "Can't symlink to root/etc/e-smith/web/panels/$panel". +- "/cgi-bin/$function: $!"; +-} +use esmith::Build::CreateLinks qw(:all); - sub panel_link - { -@@ -19,3 +20,18 @@ + #-------------------------------------------------- + # functions for user and manager panel #-------------------------------------------------- my $panel = "manager"; panel_link("webshare", $panel); @@ -43,3 +53,32 @@ diff -Nur --no-dereference smeserver-web $OUT .= "<\/Directory>\n"; $OUT .= "\n"; } +diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile +--- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile 2022-08-02 00:02:54.839000000 -0400 ++++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80AuthFile 1969-12-31 19:00:00.000000000 -0500 +@@ -1,4 +0,0 @@ +-{ +- $OUT .= load_modules(qw(auth_basic)); +- $OUT .= load_modules(qw(authn_file)); +-} +diff -Nur --no-dereference smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias +--- smeserver-webshare-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:02:54.856000000 -0400 ++++ smeserver-webshare-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86WebShareAlias 2022-08-02 00:05:30.150000000 -0400 +@@ -9,16 +9,7 @@ + $OUT .= "# webshare\/$key\n"; + $OUT .= "Alias \/webshare\/$key \/opt\/webshare\/$key\n"; + $OUT .= "\n"; +- { +- use esmith::util; +- my $release = esmith::util::determineRelease(); +- if ( "$release" ge "7.0" ) { +- $OUT .= " SSLRequireSSL\n"; +- } +- else { +- $OUT .= " RequireSSL on\n"; +- } +- } ++ $OUT .= " SSLRequireSSL\n"; + $OUT .= " Options +Indexes\n"; + $OUT .= " AllowOverride None\n"; + $OUT .= " Require all granted\n";