--- rpms/smeserver-yum/sme7/smeserver-yum-2.0.0-CentOS.patch 2012/03/17 02:00:23 1.1 +++ rpms/smeserver-yum/sme7/smeserver-yum-2.0.0-CentOS.patch 2012/03/22 22:48:35 1.3 @@ -1,10 +1,78 @@ -diff -ruN smeserver-yum-2.0.0.old/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos ---- smeserver-yum-2.0.0.old/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos 2008-10-07 15:21:29.000000000 +0100 -+++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos 2012-03-15 06:14:27.000000000 +0000 -@@ -4,5 +4,6 @@ +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL.CentOS 2012-03-22 11:45:24.866538302 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL 2012-03-22 11:45:24.866538302 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/addons/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/addons/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/BaseURL.CentOS 2012-03-22 11:45:24.866538302 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/BaseURL 2012-03-22 11:45:24.866538302 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/os/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/base/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL.CentOS 2012-03-22 11:45:24.874538802 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL 2012-03-22 11:45:24.874538802 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/centosplus/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/centosplus/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL.CentOS 2012-03-22 11:45:24.878539052 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL 2012-03-22 11:45:24.878539052 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/contrib/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/contrib/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL.CentOS 2012-03-22 11:45:24.882539302 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL 2012-03-22 11:45:24.882539302 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/extras/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/extras/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL.CentOS 2012-03-22 11:45:24.886539552 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL 2012-03-22 11:45:24.886539552 -0600 +@@ -0,0 +1 @@ ++http://vault.centos.org/4.9/updates/$basearch +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/MirrorList.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/MirrorList +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/MirrirList.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/defaults/updates/MirrorList 1969-12-31 17:00:00.000000000 -0700 +@@ -1 +0,0 @@ +-http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates +diff -up smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos.CentOS smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos +--- smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos.CentOS 2008-10-07 08:21:29.000000000 -0600 ++++ smeserver-yum-2.0.0/root/etc/e-smith/db/yum_repositories/migrate/20CentOSRepos 2012-03-22 11:46:02.464888052 -0600 +@@ -1,8 +1,12 @@ + { +- for my $name ( qw(base updates) ) ++ for my $name ( qw(addons base centosplus contrib extras updates) ) + { my $repo = $DB->get($name) or next; ++ my $mirror = $DB->get_prop_and_delete($name, 'MirrorList'); ++ next unless defined $mirror; - $repo->set_prop('Visible', 'yes'); -+ $repo->set_prop('status', 'disabled'); +- $repo->set_prop('Visible', 'yes'); ++ my $reponame = $name; ++ $reponame =~ s/base/os/; ++ $repo->set_prop('BaseURL', "http://vault.centos.org/4.9/$reponame/\$basearch"); } }