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

Add support for webmin main repo

Browse Source 
https://forum.virtualmin.com/t/warning-use-the-name-of-the-stable-distribution-instead-of-stable/122043/13?u=ilia
This commit is contained in:
Ilia Ross
2023-08-19 15:19:34 +03:00
parent a2f1f24a95
commit 160c7e4dd0
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup-repos.sh
View File

@@ -166,7 +166,7 @@ deb)
echo " .. done"
# Create repo file
echo " Setting up Webmin repository .."
echo "deb [signed-by=/usr/share/keyrings/$repoid_debian_like-$webmin_key_suffix.gpg] $webmin_download/download/newkey/repository stable contrib" >$debian_repo_file
echo "deb [signed-by=/usr/share/keyrings/$repoid_debian_like-$webmin_key_suffix.gpg] $webmin_download/download/repo webmin main" >$debian_repo_file
echo " .. done"
# Clean meta
echo " Cleaning repository metadata .."

4
webmin/fix_repo.cgi
View File

@@ -44,8 +44,8 @@ foreach my $repo ($webmin_apt_repo_file, $global_apt_repo_file) {
}
};
foreach my $l (@$lref) {
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/repository)\s+sarge\s+contrib/) {
$l = &$lreffix("deb [signed-by=$webmin_apt_repo_key] $webmin_apt_repo_url stable contrib");
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/(repository|newkey\/repository))\s+(sarge|stable)\s+contrib/) {
$l = &$lreffix("deb [signed-by=$webmin_apt_repo_key] $webmin_apt_repo_url webmin main");
$fixed++;
}
}

2
webmin/lang/en
View File

@@ -1014,7 +1014,7 @@ notif_updateok=Install Updates Now
notif_reboot=Recent package updates (such as a new kernel version) require a reboot to be fully applied.
notif_rebootok=Reboot Now
notify_yumrepo=Your system is using the old Webmin repository. Click the button below to switch to the new repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notify_aptrepo=Your system is using the old Webmin repository. Click the button below to switch to the new <tt>stable</tt> repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notify_aptrepo_newkey=Your system is using obsolete Webmin repository. Please click the button below to switch to the new <tt>webmin main</tt> repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notif_fixreponow=Update Webmin Repository
status_title=Background Status Collection

9
webmin/webmin-lib.pl
View File

@@ -67,8 +67,10 @@ our $webmin_yum_repo_mirrorlist = $webmin_yum_repo_url."/mirrorlist";
our $webmin_yum_repo_key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-webmin-developers";
our $webmin_apt_repo_file = "/etc/apt/sources.list.d/webmin.list";
our $webmin_apt_repo_url = "https://download.webmin.com/download/newkey/repository";
our $webmin_apt_repo_url = "https://download.webmin.com/download/repo";
our $webmin_apt_repo_key = "/usr/share/keyrings/debian-webmin-developers.gpg";
$webmin_apt_repo_key = "/usr/share/keyrings/ubuntu-webmin-developers.gpg"
if ($gconfig{'real_os_type'} =~ /ubuntu/i);
our $global_apt_repo_file = "/etc/apt/sources.list";
# Obsolete, but still defined so it can be deleted
@@ -1340,9 +1342,8 @@ foreach my $repo ($webmin_apt_repo_file, $global_apt_repo_file) {
next if (!-r $repo);
my $lref = &read_file_lines($repo, 1);
foreach my $l (@$lref) {
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/repository)\s+sarge\s+contrib/) {
$repoerr = &text('notify_aptrepo',
$webmin_apt_repo_url);
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/(repository|newkey\/repository))\s+(sarge|stable)\s+contrib/) {
$repoerr = &text('notify_aptrepo_newkey', $webmin_apt_repo_url);
last;
}
}