From 246e1eac51d287b0185b0a67cf20461aadab17a9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:28:55 +0000 Subject: [PATCH 1/7] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 0d112cce6b402b5e1af728b6349be2e1590ac27b Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 30 Dec 2008 00:30:22 +0000 Subject: [PATCH 2/7] Change writes to YUMTMP to be appends to work around selinux policy oddness in bug 431588 this requires the added policycoreutils dependancy --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 9 +++++++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 4e73716..217b28e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.8.2.tar.gz +yum-cron-0.8.3.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..d6ad4ed --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978 diff --git a/sources b/sources index 7614bff..9770d34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d824c4bfc76daa5040f77b3bbc39556e yum-cron-0.8.2.tar.gz +e0f8aba0a21739cf1120e5096cd28fad yum-cron-0.8.3.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 6a74fba..17e0976 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.8.2 +Version: 0.8.3 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 +Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -91,6 +91,11 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Sun Dec 14 2008 Alec Habig - 0.8.3-1 +- Change writes to YUMTMP to be appends to work around selinux policy + oddness in bug 431588 +- this requires the added policycoreutils dependancy + * Wed Mar 12 2008 Alec Habig - 0.8.2-1 - Add YUM_PARAMETER for user specified parameters to the sysconf file From e58c2a52976bec83d8e5ee41b3d44c5b70088bda Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Fri, 21 Aug 2009 19:32:33 +0000 Subject: [PATCH 3/7] deal with stale lockdirs, bug 515814 --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 13 +++++++++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 217b28e..6f2d05e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.8.3.tar.gz +yum-cron-0.8.4.tar.gz diff --git a/import.log b/import.log index d6ad4ed..d4fb01e 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978 +yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134 diff --git a/sources b/sources index 9770d34..9cc0633 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0f8aba0a21739cf1120e5096cd28fad yum-cron-0.8.3.tar.gz +c80fd195f7b1eaaa42198693960a2171 yum-cron-0.8.4.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 17e0976..db4d0e0 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.3 -Release: 1%{?dist} +Version: 0.8.4 +Release: 2%{?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 @@ -91,6 +91,15 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Fri Aug 21 2009 Alec Habig - 0.8.4-2 +- pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles + +* Wed Aug 5 2009 Alec Habig - 0.8.4-1 +- deal with stale lockdirs + +* Wed Feb 25 2009 Fedora Release Engineering - 0.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Dec 14 2008 Alec Habig - 0.8.3-1 - Change writes to YUMTMP to be appends to work around selinux policy oddness in bug 431588 From 31bca498ebdd2a83f2c9640d4109cf0fb47df98e Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 7 Oct 2009 13:30:06 +0000 Subject: [PATCH 4/7] - 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 d4fb01e..1a82b97 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978 yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134 +yum-cron-0_9_0-1_fc11:F-10:yum-cron-0.9.0-1.fc11.src.rpm:1254922191 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 1dc275a76b76d63857a4d849268cfdd78cd2fa28 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 14 Oct 2009 13:36:56 +0000 Subject: [PATCH 5/7] - 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 1a82b97..39147b3 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978 yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134 yum-cron-0_9_0-1_fc11:F-10:yum-cron-0.9.0-1.fc11.src.rpm:1254922191 +yum-cron-0_9_1-1_fc11:F-10:yum-cron-0.9.1-1.fc11.src.rpm:1255527403 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 b79229155674c352af7e884ee8c6ac7600dfe9a6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:38 +0000 Subject: [PATCH 6/7] 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 f2c9271af276476049cf0108d24d6549e59d04ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:25:58 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 39147b3..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978 -yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134 -yum-cron-0_9_0-1_fc11:F-10:yum-cron-0.9.0-1.fc11.src.rpm:1254922191 -yum-cron-0_9_1-1_fc11:F-10:yum-cron-0.9.1-1.fc11.src.rpm:1255527403