smeserver-yum/sme10/smeserver-yum-2.6.2-bz12661-bz12715.patch

diff -Nur --no-dereference smeserver-yum-2.6.2.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.6.2/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL
--- smeserver-yum-2.6.2.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL    2022-07-11 11:10:46.000000000 -0400
+++ smeserver-yum-2.6.2/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL        2024-07-30 11:37:47.088000000 -0400
@@ -46,7 +46,9 @@
         my $rname = ( $name eq 'base'  )? 'os' :$name;
        my $sclo = "";
        $sclo = "rh/" if $name eq "centos-sclo-rh";
-       $sclo = "sclo/" if $name eq "centos-sclo-centos"; 
+        $rname = "sclo" if $name eq "centos-sclo-rh";
+       $sclo = "sclo/" if $name eq "centos-sclo-centos";
+        $rname = "sclo" if $name eq "centos-sclo-centos"; 
         # setprop BaseURL  "http://vault.centos.org/$SUBVER/$rname/\$basearch/"
         $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/$sclo");
         # delprop MirrorList
diff -Nur --no-dereference smeserver-yum-2.6.2.old/root/usr/lib/yum-plugins/smeserver.py smeserver-yum-2.6.2/root/usr/lib/yum-plugins/smeserver.py
--- smeserver-yum-2.6.2.old/root/usr/lib/yum-plugins/smeserver.py       2022-07-11 11:13:39.000000000 -0400
+++ smeserver-yum-2.6.2/root/usr/lib/yum-plugins/smeserver.py   2024-07-30 11:37:11.292000000 -0400
@@ -55,7 +55,7 @@
 servicenames['httpd']='httpd-admin','httpd-e-smith',
 servicenames['iptables']='masq',
 servicenames['mariadb']='mariadb',
-servicenames['nut']='nut-server','nut-driver','nut-monitor',
+servicenames['nut']='nut',
 servicenames['openldap']='ldap',
 servicenames['openssh']='sshd',
 servicenames['php']='httpd-e-smith', 'php-fpm', 'php55-php-fpm', 'php56-php-fpm', 'php70-php-fpm', 'php71-php-fpm', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm',
1	jpp	1.1	diff -Nur --no-dereference smeserver-yum-2.6.2.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.6.2/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL
2			--- smeserver-yum-2.6.2.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2022-07-11 11:10:46.000000000 -0400
3			+++ smeserver-yum-2.6.2/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2024-07-30 11:37:47.088000000 -0400
4			@@ -46,7 +46,9 @@
5			my $rname = ( $name eq 'base' )? 'os' :$name;
6			my $sclo = "";
7			$sclo = "rh/" if $name eq "centos-sclo-rh";
8			- $sclo = "sclo/" if $name eq "centos-sclo-centos";
9			+ $rname = "sclo" if $name eq "centos-sclo-rh";
10			+ $sclo = "sclo/" if $name eq "centos-sclo-centos";
11			+ $rname = "sclo" if $name eq "centos-sclo-centos";
12			# setprop BaseURL "http://vault.centos.org/$SUBVER/$rname/\$basearch/"
13			$repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/$sclo");
14			# delprop MirrorList
15			diff -Nur --no-dereference smeserver-yum-2.6.2.old/root/usr/lib/yum-plugins/smeserver.py smeserver-yum-2.6.2/root/usr/lib/yum-plugins/smeserver.py
16			--- smeserver-yum-2.6.2.old/root/usr/lib/yum-plugins/smeserver.py 2022-07-11 11:13:39.000000000 -0400
17			+++ smeserver-yum-2.6.2/root/usr/lib/yum-plugins/smeserver.py 2024-07-30 11:37:11.292000000 -0400
18			@@ -55,7 +55,7 @@
19			servicenames['httpd']='httpd-admin','httpd-e-smith',
20			servicenames['iptables']='masq',
21			servicenames['mariadb']='mariadb',
22			-servicenames['nut']='nut-server','nut-driver','nut-monitor',
23			+servicenames['nut']='nut',
24			servicenames['openldap']='ldap',
25			servicenames['openssh']='sshd',
26			servicenames['php']='httpd-e-smith', 'php-fpm', 'php55-php-fpm', 'php56-php-fpm', 'php70-php-fpm', 'php71-php-fpm', 'php72-php-fpm', 'php73-php-fpm', 'php74-php-fpm', 'php80-php-fpm', 'php81-php-fpm',