From d93cffc7f217037a4b1fa5a4a6a6630ce7d9219a Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Wed, 3 Mar 2021 02:37:03 +0300 Subject: [PATCH 1/4] Revert "Drop blue-theme" This reverts commit 8bb5b235502e6267db4a6699e9ab83789c45c66f. --- mod_def_list.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_def_list.txt b/mod_def_list.txt index 099864a9b..f56bf1a3a 100644 --- a/mod_def_list.txt +++ b/mod_def_list.txt @@ -1 +1 @@ -cron dfsadmin exports inetd init mount samba useradmin fdisk format proc webmin quota software pap acl apache lpadmin bind8 sendmail squid bsdexports hpuxexports net dhcpd custom telnet servers time wuftpd syslog mysql man inittab raid postfix webminlog postgresql xinetd status cpan pam nis shell grub fetchmail passwd at proftpd sshd heartbeat cluster-software cluster-useradmin qmailadmin mon jabber stunnel usermin fsdump lvm procmail cluster-webmin firewall sgiexports vgetty openslp webalizer shorewall adsl-client updown ppp-client pptp-server pptp-client ipsec ldap-useradmin change-user cluster-shell cluster-cron spam htaccess-htpasswd logrotate cluster-passwd mailboxes ipfw sarg bandwidth cluster-copy backup-config smart-status idmapd krb5 smf ipfilter rbac tunnel zones cluster-usermin dovecot syslog-ng mailcap ldap-client phpini filter bacula-backup ldap-server exim tcpwrappers package-updates system-status webmincron ajaxterm shorewall6 iscsi-server iscsi-client gray-theme iscsi-target iscsi-tgtd bsdfdisk fail2ban authentic-theme firewalld filemin firewall6 \ No newline at end of file +cron dfsadmin exports inetd init mount samba useradmin fdisk format proc webmin quota software pap acl apache lpadmin bind8 sendmail squid bsdexports hpuxexports net dhcpd custom telnet servers time wuftpd syslog mysql man inittab raid postfix webminlog postgresql xinetd status cpan pam nis shell grub fetchmail passwd at proftpd sshd heartbeat cluster-software cluster-useradmin qmailadmin mon jabber stunnel usermin fsdump lvm procmail cluster-webmin firewall sgiexports vgetty openslp webalizer shorewall adsl-client updown ppp-client pptp-server pptp-client ipsec ldap-useradmin change-user cluster-shell cluster-cron spam htaccess-htpasswd logrotate cluster-passwd mailboxes ipfw sarg bandwidth cluster-copy backup-config smart-status idmapd krb5 smf ipfilter rbac tunnel zones cluster-usermin dovecot syslog-ng mailcap blue-theme ldap-client phpini filter bacula-backup ldap-server exim tcpwrappers package-updates system-status webmincron ajaxterm shorewall6 iscsi-server iscsi-client gray-theme iscsi-target iscsi-tgtd bsdfdisk fail2ban authentic-theme firewalld filemin firewall6 \ No newline at end of file From e18864166494b0a44f30c1065a9e5577f7b1538f Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Wed, 3 Mar 2021 02:38:12 +0300 Subject: [PATCH 2/4] Don't double list symlinked themes --- web-lib-funcs.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl index a4683cd02..1867b2bd8 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -5712,6 +5712,7 @@ opendir(DIR, $root_directory); foreach my $m (readdir(DIR)) { my %tinfo; next if ($m =~ /^\./); + next if (-l "$root_directory/$m"); next if (!&read_file_cached("$root_directory/$m/theme.info", \%tinfo)); next if (!&check_os_support(\%tinfo)); foreach my $o (@lang_order_list) { From 19f4b5ebdadb454a78508b5b6cd05410a21dc3cf Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Wed, 3 Mar 2021 02:45:53 +0300 Subject: [PATCH 3/4] Revert "Don't double list symlinked themes" This reverts commit e18864166494b0a44f30c1065a9e5577f7b1538f. --- web-lib-funcs.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl index 1867b2bd8..a4683cd02 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -5712,7 +5712,6 @@ opendir(DIR, $root_directory); foreach my $m (readdir(DIR)) { my %tinfo; next if ($m =~ /^\./); - next if (-l "$root_directory/$m"); next if (!&read_file_cached("$root_directory/$m/theme.info", \%tinfo)); next if (!&check_os_support(\%tinfo)); foreach my $o (@lang_order_list) { From c5f598ae58296bb7a57cdb4f13234d1fcc66a7c5 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Tue, 2 Mar 2021 15:47:50 -0800 Subject: [PATCH 4/4] Don't copy in blue-theme, just make it a link --- makedist.pl | 5 +++++ mod_def_list.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/makedist.pl b/makedist.pl index 1f130176e..c627e943a 100755 --- a/makedist.pl +++ b/makedist.pl @@ -142,6 +142,11 @@ while($d = readdir(DIR)) { } closedir(DIR); +# Make blue-theme a symlink instead of a copy +if (!$min && -r "$tardir/gray-theme") { + system("cd $tardir && ln -s gray-theme blue-theme"); + } + # Remove useless .bak, test and other files, and create the tar.gz file print "Creating webmin-$vfile.tar.gz\n"; system("cd $tardir ; tar cvhf - $dir 2>/dev/null | gzip -c >webmin-$vfile.tar.gz"); diff --git a/mod_def_list.txt b/mod_def_list.txt index f56bf1a3a..099864a9b 100644 --- a/mod_def_list.txt +++ b/mod_def_list.txt @@ -1 +1 @@ -cron dfsadmin exports inetd init mount samba useradmin fdisk format proc webmin quota software pap acl apache lpadmin bind8 sendmail squid bsdexports hpuxexports net dhcpd custom telnet servers time wuftpd syslog mysql man inittab raid postfix webminlog postgresql xinetd status cpan pam nis shell grub fetchmail passwd at proftpd sshd heartbeat cluster-software cluster-useradmin qmailadmin mon jabber stunnel usermin fsdump lvm procmail cluster-webmin firewall sgiexports vgetty openslp webalizer shorewall adsl-client updown ppp-client pptp-server pptp-client ipsec ldap-useradmin change-user cluster-shell cluster-cron spam htaccess-htpasswd logrotate cluster-passwd mailboxes ipfw sarg bandwidth cluster-copy backup-config smart-status idmapd krb5 smf ipfilter rbac tunnel zones cluster-usermin dovecot syslog-ng mailcap blue-theme ldap-client phpini filter bacula-backup ldap-server exim tcpwrappers package-updates system-status webmincron ajaxterm shorewall6 iscsi-server iscsi-client gray-theme iscsi-target iscsi-tgtd bsdfdisk fail2ban authentic-theme firewalld filemin firewall6 \ No newline at end of file +cron dfsadmin exports inetd init mount samba useradmin fdisk format proc webmin quota software pap acl apache lpadmin bind8 sendmail squid bsdexports hpuxexports net dhcpd custom telnet servers time wuftpd syslog mysql man inittab raid postfix webminlog postgresql xinetd status cpan pam nis shell grub fetchmail passwd at proftpd sshd heartbeat cluster-software cluster-useradmin qmailadmin mon jabber stunnel usermin fsdump lvm procmail cluster-webmin firewall sgiexports vgetty openslp webalizer shorewall adsl-client updown ppp-client pptp-server pptp-client ipsec ldap-useradmin change-user cluster-shell cluster-cron spam htaccess-htpasswd logrotate cluster-passwd mailboxes ipfw sarg bandwidth cluster-copy backup-config smart-status idmapd krb5 smf ipfilter rbac tunnel zones cluster-usermin dovecot syslog-ng mailcap ldap-client phpini filter bacula-backup ldap-server exim tcpwrappers package-updates system-status webmincron ajaxterm shorewall6 iscsi-server iscsi-client gray-theme iscsi-target iscsi-tgtd bsdfdisk fail2ban authentic-theme firewalld filemin firewall6 \ No newline at end of file