michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to properly test default module

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-07-20 16:26:11 +03:00
parent fdb1a2909b
commit c56591bd63
4 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
makedist.pl
View File

@@ -52,34 +52,13 @@ if ($min) {
}
else {
# All the modules
@mlist =
("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",
);
my $mod_def_list;
my $curr_dir = $0;
($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/;
open(my $fh, '<', "$curr_dir/mod_def_list.txt") || die "Error opening \"mod_def_list.txt\" : $!\n";
$mod_def_list = do { local $/; <$fh> };
close($fh);
@mlist = split(/\s+/, $mod_def_list);
}
@dirlist = ( "WebminUI", "JSON" );

14
makemoduledeb.pl
View File

@@ -231,9 +231,17 @@ if ($debdepends && exists($minfo{'depends'})) {
# If the module is part of Webmin, we don't need to depend on it
if ($dmod) {
my %dinfo;
read_file("$dmod/module.info", \%dinfo);
next if ($dinfo{'longdesc'});
my $mod_def_list;
my @mod_def_list;
my $curr_dir = $0;
($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/;
open(my $fh, '<', "$curr_dir/mod_def_list.txt") || die "Error opening \"mod_def_list.txt\" : $!\n";
$mod_def_list = do { local $/; <$fh> };
close($fh);
@mod_def_list = split(/\s+/, $mod_def_list);
if ( grep( /^$dmod$/, @mod_def_list ) ) {
next;
}
}
push(@rdeps, $dwebmin ? ("$product (>= $dwebmin)") :
$dver ? ("$prefix$dmod (>= $dver)") :

14
makemodulerpm.pl
View File

@@ -246,9 +246,17 @@ if ($rpmdepends && defined($minfo{'depends'})) {
# If the module is part of Webmin, we don't need to depend on it
if ($dmod) {
my %dinfo;
&read_file("$dmod/module.info", \%dinfo) || die "Failed to read $dmod/module.info for depenendency check";
next if ($dinfo{'longdesc'});
my $mod_def_list;
my @mod_def_list;
my $curr_dir = $0;
($curr_dir) = $curr_dir =~ /^(.+)\/[^\/]+$/;
open(my $fh, '<', "$curr_dir/mod_def_list.txt") || die "Error opening \"mod_def_list.txt\" : $!\n";
$mod_def_list = do { local $/; <$fh> };
close($fh);
@mod_def_list = split(/\s+/, $mod_def_list);
if ( grep( /^$dmod$/, @mod_def_list ) ) {
next;
}
}
push(@rdeps, $dwebmin ? ("webmin", ">=", $dwebmin) :
$dver ? ($prefix.$dmod, ">=", $dver) :

1
mod_def_list.txt Normal file
View File

@@ -0,0 +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