--- rpms/smeserver-yum/sme9/smeserver-yum-2.4.0.check4updates_to_smecontribs.patch	2014/11/19 17:22:34	1.1
+++ rpms/smeserver-yum/sme9/smeserver-yum-2.4.0.check4updates_to_smecontribs.patch	2015/02/21 16:32:02	1.2
@@ -1,11 +1,31 @@
-diff -Nur smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates
---- smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates	1970-01-01 01:00:00.000000000 +0100
-+++ smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates	2014-11-19 17:59:47.540381038 +0100
-@@ -0,0 +1,25 @@
+diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs
+--- smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs	1970-01-01 01:00:00.000000000 +0100
++++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs	2015-02-21 15:20:54.982110115 +0100
+@@ -0,0 +1 @@
++enabled
+diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates
+--- smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates	1970-01-01 01:00:00.000000000 +0100
++++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates	2015-02-21 16:28:14.387219668 +0100
+@@ -0,0 +1,11 @@
 +{
-+    return "\n# yum check for updates is disabled\n" unless $yum{status} eq 'enabled';
++#Added for bug 8855 and bug 8858
++#we want to remove the property check4contribsupdates
++
 +
-+    my $freq = $yum{check4contribsupdates} || 'daily';
++my $check4contribsupdates = $DB->get_prop('yum','check4contribsupdates');
++
++if ($check4contribsupdates) {
++    $DB->get('yum')->delete_prop('check4contribsupdates');
++    }
++}
+diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.4.0.bz8855/root/etc/e-smith/templates/etc/crontab/check4contribsupdates
+--- smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates	1970-01-01 01:00:00.000000000 +0100
++++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/templates/etc/crontab/check4contribsupdates	2015-02-21 15:29:17.585570439 +0100
+@@ -0,0 +1,25 @@
++{
++    return "\n# yum check for smecontribs updates is disabled\n" unless (($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled'));
++ 
++    my $freq = $yum{check4updates} || 'daily';
 +
 +    my $min;
 +    my $dom;
@@ -27,9 +47,9 @@ diff -Nur smeserver-yum-2.4.0.old/root/e
 +    return "$min 4 $dom * $dow root "
 +       . q{sleep $[ $RANDOM \\% 3600 ]; /sbin/e-smith/check4contribsupdates -m };
 +}
-diff -Nur smeserver-yum-2.4.0.old/root/sbin/e-smith/check4contribsupdates smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates
---- smeserver-yum-2.4.0.old/root/sbin/e-smith/check4contribsupdates	1970-01-01 01:00:00.000000000 +0100
-+++ smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates	2014-11-19 17:58:02.709057486 +0100
+diff -Nur smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates smeserver-yum-2.4.0.bz8855/root/sbin/e-smith/check4contribsupdates
+--- smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates	1970-01-01 01:00:00.000000000 +0100
++++ smeserver-yum-2.4.0.bz8855/root/sbin/e-smith/check4contribsupdates	2015-02-21 15:18:57.521125460 +0100
 @@ -0,0 +1,27 @@
 +#! /bin/bash
 +