From 1606e87303913bd29a62b12008e1df27fd355340 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 7 Oct 2009 13:28:56 +0000 Subject: [PATCH 1/8] - Change cron file to 0yum.cron, so yum updates things before the other daily jobs such as makewhatis, prelink, updatedb, etc run. That way updated files get picked up properly. Cost - those jobs will run later. Resolves bug 445894. Changed default random delay to 60 minutes from 120 to reduce the cost. - Eliminate the weekly package cleaning script. Replace with logic in the daily script to clean the packages and the metadata once per week (otherwise corrupted meta data messes things up indefinitely). Resolves bug 526452. Removal of seperate weekly script resolves bug 524461. - Use find to clear stale locks at start of run, so add findutils req. --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 24 +++++++++++++++++------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6f2d05e..c384c1a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.8.4.tar.gz +yum-cron-0.9.0.tar.gz diff --git a/import.log b/import.log index f0aa146..75b2e1c 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009 +yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039 diff --git a/sources b/sources index 9cc0633..0727f47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c80fd195f7b1eaaa42198693960a2171 yum-cron-0.8.4.tar.gz +bad2ff53cb924a964c4909f24e6f34b3 yum-cron-0.9.0.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index db4d0e0..5ab4940 100644 --- a/yum-cron.spec +++ b/yum-cron.spec @@ -1,7 +1,7 @@ Summary: Files needed to run yum updates as a cron job Name: yum-cron -Version: 0.8.4 -Release: 2%{?dist} +Version: 0.9.0 +Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz License: GPLv2 Group: System Environment/Base BuildArch: noarch -Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils +Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemon. %install rm -rf $RPM_BUILD_ROOT -install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron -install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron +install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum +install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron %clean @@ -84,13 +84,23 @@ exit 0 %files %defattr(-,root,root) %doc COPYING README -%{_sysconfdir}/cron.daily/yum.cron -%{_sysconfdir}/cron.weekly/yum.cron +%{_sysconfdir}/cron.daily/0yum.cron %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum +%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum %{_sysconfdir}/rc.d/init.d/yum-cron %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Tue Oct 6 2009 Alec Habig - 0.9.0-1 +- Change cron file to 0yum.cron, so yum updates things before the other daily jobs + such as makewhatis, prelink, updatedb, etc run. That way updated files get picked up + properly. Cost - those jobs will run later. Resolves bug 445894. Changed default + random delay to 60 minutes from 120 to reduce the cost. +- Eliminate the weekly package cleaning script. Replace with logic in the daily script + to clean the packages and the metadata once per week (otherwise corrupted metadata messes + things up indefinitely). Resolves bug 526452. Removal of seperate weekly script resolves + bug 524461. +- Use find to clear stale locks at start of run, so add findutils req. * Fri Aug 21 2009 Alec Habig - 0.8.4-2 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles From 30e0f09a6aa643e48185dd718ff4ca02301cd736 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 14 Oct 2009 13:36:04 +0000 Subject: [PATCH 2/8] - Fixed CLEANDAY default in script - changed the /etc/yum/ scripts to not be marked as a config file in the .spec - we always want them updated, they're code not config. rpmlint used to complain about them not being marked as config files, but seems to have grown out of this weirdness in the meantime . --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 12 +++++++++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c384c1a..57858a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.9.0.tar.gz +yum-cron-0.9.1.tar.gz diff --git a/import.log b/import.log index 75b2e1c..69af3bb 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009 yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039 +yum-cron-0_9_1-1_fc11:F-12:yum-cron-0.9.1-1.fc11.src.rpm:1255527348 diff --git a/sources b/sources index 0727f47..11b97ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bad2ff53cb924a964c4909f24e6f34b3 yum-cron-0.9.0.tar.gz +894d3857361c926963c04d2c18552d3e yum-cron-0.9.1.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 5ab4940..fa66ca3 100644 --- a/yum-cron.spec +++ b/yum-cron.spec @@ -1,6 +1,6 @@ Summary: Files needed to run yum updates as a cron job Name: yum-cron -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to @@ -85,12 +85,18 @@ exit 0 %defattr(-,root,root) %doc COPYING README %{_sysconfdir}/cron.daily/0yum.cron -%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum -%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum +%{_sysconfdir}/yum/yum-daily.yum +%{_sysconfdir}/yum/yum-weekly.yum %{_sysconfdir}/rc.d/init.d/yum-cron %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Fri Oct 9 2009 Alec Habig - 0.9.1-1 +- Fixed CLEANDAY default in script +- changed the /etc/yum/ scripts to not be marked as a config file in + the .spec - we always want them updated, they're code not config. + rpmlint used to complain about them not being marked as config files, + but seems to have grown out of this weirdness in the meantime . * Tue Oct 6 2009 Alec Habig - 0.9.0-1 - Change cron file to 0yum.cron, so yum updates things before the other daily jobs such as makewhatis, prelink, updatedb, etc run. That way updated files get picked up From 216b60db2622a214093dc99585bc51410af179f7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:38 +0000 Subject: [PATCH 3/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb083e1..9627157 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yum-cron -# $Id$ +# $Id: Makefile,v 1.1 2007/08/20 23:00:43 kevin Exp $ NAME := yum-cron SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9ceee414762cea191489061ed77f91300dd5a3b9 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 10 Feb 2010 21:37:00 +0000 Subject: [PATCH 4/8] - Changed the shebang to refer to bash rather than sh, as bashisms are used so bash should be required (bug 550449) - Test for restorecon and mailx as they're used, so systems without them are not forced to install to use this package (removed the dependancies, bug 550447) --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 10 ++++++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57858a5..5322070 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.9.1.tar.gz +yum-cron-0.9.2.tar.gz diff --git a/import.log b/import.log index 69af3bb..5457dd7 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009 yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039 yum-cron-0_9_1-1_fc11:F-12:yum-cron-0.9.1-1.fc11.src.rpm:1255527348 +yum-cron-0_9_2-1_fc12:F-12:yum-cron-0.9.2-1.fc12.src.rpm:1265837795 diff --git a/sources b/sources index 11b97ff..6d4e049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -894d3857361c926963c04d2c18552d3e yum-cron-0.9.1.tar.gz +c97f4de4c6b95ff130636298edcfdc71 yum-cron-0.9.2.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index fa66ca3..3841afa 100644 --- a/yum-cron.spec +++ b/yum-cron.spec @@ -1,6 +1,6 @@ Summary: Files needed to run yum updates as a cron job Name: yum-cron -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to @@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz License: GPLv2 Group: System Environment/Base BuildArch: noarch -Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils +Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly findutils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -91,6 +91,12 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Mon Feb 1 2010 Alec Habig - 0.9.2-1 +- Changed the shebang to refer to bash rather than sh, as bashisms are + used so bash should be required (bug 550449) +- Test for restorecon and mailx as they're used, so systems without them + are not forced to install to use this package (removed the + dependancies, bug 550447) * Fri Oct 9 2009 Alec Habig - 0.9.1-1 - Fixed CLEANDAY default in script - changed the /etc/yum/ scripts to not be marked as a config file in From 0f1c00f6c7d3d3bcdc53175713356a8c8368c9be Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:29:56 +0000 Subject: [PATCH 5/8] Initialize branch EL-6 for yum-cron --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 5d76fb9ca14dd9895e7ed86b9c1233d289ba9594 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Fri, 2 Jul 2010 11:25:18 +0000 Subject: [PATCH 6/8] Added for EPL in EL-6 --- import.log | 1 + 1 file changed, 1 insertion(+) diff --git a/import.log b/import.log index 5457dd7..7ebcdda 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009 yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039 yum-cron-0_9_1-1_fc11:F-12:yum-cron-0.9.1-1.fc11.src.rpm:1255527348 yum-cron-0_9_2-1_fc12:F-12:yum-cron-0.9.2-1.fc12.src.rpm:1265837795 +yum-cron-0_9_2-1_fc12:EL-6:yum-cron-0.9.2-1.fc12.src.rpm:1278069868 From 6bd9832d78bbff1505a6cfc826e7bfdd996fee0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:26:03 +0000 Subject: [PATCH 7/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 7 ------- 4 files changed, 29 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9627157..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yum-cron -# $Id: Makefile,v 1.1 2007/08/20 23:00:43 kevin Exp $ -NAME := yum-cron -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 7ebcdda..0000000 --- a/import.log +++ /dev/null @@ -1,7 +0,0 @@ -yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060 -yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003 -yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009 -yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039 -yum-cron-0_9_1-1_fc11:F-12:yum-cron-0.9.1-1.fc11.src.rpm:1255527348 -yum-cron-0_9_2-1_fc12:F-12:yum-cron-0.9.2-1.fc12.src.rpm:1265837795 -yum-cron-0_9_2-1_fc12:EL-6:yum-cron-0.9.2-1.fc12.src.rpm:1278069868 From 141853ea7fc840f19d6ea576f44d044b80761b39 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 12 Nov 2010 14:24:13 -0500 Subject: [PATCH 8/8] change url and bump release to test something in epel builds --- yum-cron.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yum-cron.spec b/yum-cron.spec index 3841afa..8ad9ffb 100644 --- a/yum-cron.spec +++ b/yum-cron.spec @@ -1,8 +1,8 @@ Summary: Files needed to run yum updates as a cron job Name: yum-cron Version: 0.9.2 -Release: 1%{?dist} -URL: http://linux.duke.edu/yum/ +Release: 2%{?dist} +URL: http://yum.baseurl.org/ # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -91,6 +91,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Fri Nov 12 2010 Seth Vidal - 0.9.2-2 +- change url to point to yum.baseurl.org instead of linux.duke.edu + * Mon Feb 1 2010 Alec Habig - 0.9.2-1 - Changed the shebang to refer to bash rather than sh, as bashisms are used so bash should be required (bug 550449)