1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to prefer JSON::XS over JSON::PP

Browse Source
This commit is contained in:
Ilia Ross 2024-12-21 22:50:52 +02:00
parent 94bb4921d2
commit 56c0f5ea32
No known key found for this signature in database
GPG Key ID: 121E166DD9C821AB
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makedebian.pl
View File

@ -107,7 +107,7 @@ if ($product eq "webmin") {
$size = int(`du -sk $tmp_dir`);
@deps = ( "perl", "libnet-ssleay-perl", "openssl", "libauthen-pam-perl", "libpam-runtime", "libio-pty-perl", "unzip", "shared-mime-info", "tar", "libdigest-sha-perl", "libdigest-md5-perl", "gzip" );
$deps = join(", ", @deps);
@recommends = ( "libdatetime-perl", "libdatetime-timezone-perl", "libdatetime-locale-perl", "libtime-piece-perl", "libencode-detect-perl", "libtime-hires-perl", "libsocket6-perl", "html2text", "qrencode", "libdbi-perl", "libdbd-mysql-perl" );
@recommends = ( "libdatetime-perl", "libdatetime-timezone-perl", "libdatetime-locale-perl", "libtime-piece-perl", "libencode-detect-perl", "libtime-hires-perl", "libsocket6-perl", "html2text", "qrencode", "libdbi-perl", "libdbd-mysql-perl", "libjson-xs-perl" );
$recommends = join(", ", @recommends);
open(CONTROL, ">$control_file");
print CONTROL <<EOF;

2
makerpm.pl
View File

@ -87,7 +87,7 @@ Release: $rel
Provides: %{name}-%{version} perl(WebminCore)
Requires(pre): /usr/bin/perl
Requires: /bin/sh /usr/bin/perl perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar gzip
Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece) perl(Encode::Detect) perl(Time::HiRes) perl(Socket6) html2text shared-mime-info perl-File-Basename perl-File-Path qrencode perl(DBI) perl(DBD::mysql)
Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece) perl(Encode::Detect) perl(Time::HiRes) perl(Socket6) html2text shared-mime-info perl-File-Basename perl-File-Path perl-JSON-XS qrencode perl(DBI) perl(DBD::mysql)
AutoReq: 0
License: BSD-3-clause
Group: System/Tools

8
setup.pl
View File

@ -966,10 +966,10 @@ if (!$ENV{'nostart'}) {
print "Since Webmin was installed outside the package manager, ensure the\n";
print "following recommended Perl modules and packages are present:\n";
print " Perl modules:\n";
print " - DateTime, DateTime::Locale, DateTime::TimeZone, Data::Dumper\n";
print " - Digest::MD5, Digest::SHA, Encode::Detect, File::Basename\n";
print " - File::Path, Net::SSLeay, Time::HiRes, Time::Local, Time::Piece\n";
print " - lib, open\n";
print " - DateTime, DateTime::Locale, DateTime::TimeZone, Data::Dumper,\n";
print " - Digest::MD5, Digest::SHA, Encode::Detect, File::Basename,\n";
print " - File::Path, Net::SSLeay, Time::HiRes, Time::Local, Time::Piece,\n";
print " - JSON::XS, lib, open\n";
print " Packages:\n";
print " - openssl - Cryptography library with TLS implementation\n";
print " - shared-mime-info - Shared MIME information database\n";

8
setup.sh
View File

@ -1046,10 +1046,10 @@ if [ "$nostart" = "" ]; then
echo "Since Webmin was installed outside the package manager, ensure the"
echo "following recommended Perl modules and packages are present:"
echo " Perl modules:"
echo " - DateTime, DateTime::Locale, DateTime::TimeZone, Data::Dumper"
echo " - Digest::MD5, Digest::SHA, Encode::Detect, File::Basename"
echo " - File::Path, Net::SSLeay, Time::HiRes, Time::Local, Time::Piece"
echo " - lib, open"
echo " - DateTime, DateTime::Locale, DateTime::TimeZone, Data::Dumper,"
echo " - Digest::MD5, Digest::SHA, Encode::Detect, File::Basename,"
echo " - File::Path, Net::SSLeay, Time::HiRes, Time::Local, Time::Piece,"
echo " - JSON::XS, lib, open"
echo " Packages:"
echo " - openssl - Cryptography library with TLS implementation"
echo " - shared-mime-info - Shared MIME information database"