From 22a752281c5a7ab86e4c9328d04b5da596c4116e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:34:57 +0000 Subject: [PATCH 1/9] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 82cee4e6d4fbaffdcfd86846599c33028e1b09e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:25:56 +0000 Subject: [PATCH 2/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 6 ------ 4 files changed, 28 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 3a41ec9..0000000 --- a/import.log +++ /dev/null @@ -1,6 +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:HEAD:yum-cron-0.9.0-1.fc11.src.rpm:1254867260 -yum-cron-0_9_1-1_fc11:HEAD:yum-cron-0.9.1-1.fc11.src.rpm:1255527284 -yum-cron-0_9_2-1_fc12:HEAD:yum-cron-0.9.2-1.fc12.src.rpm:1265836894 From 3a1db30cd21d33063557bc793d6858c9bbcde6db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:26:00 +0000 Subject: [PATCH 3/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 6 ------ 3 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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/import.log b/import.log deleted file mode 100644 index 3a41ec9..0000000 --- a/import.log +++ /dev/null @@ -1,6 +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:HEAD:yum-cron-0.9.0-1.fc11.src.rpm:1254867260 -yum-cron-0_9_1-1_fc11:HEAD:yum-cron-0.9.1-1.fc11.src.rpm:1255527284 -yum-cron-0_9_2-1_fc12:HEAD:yum-cron-0.9.2-1.fc12.src.rpm:1265836894 From efe3b8c713641f68dfa7891e2d5caf1685a8b960 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 5 Jan 2011 12:30:11 -0600 Subject: [PATCH 4/9] Mark /etc/yum/yum-*.yum as config files Mark /etc/yum/yum-*.yum as config files so updates don't wipe them out. --- yum-cron.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yum-cron.spec b/yum-cron.spec index 3841afa..6fc67d6 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.9.2 -Release: 1%{?dist} +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 @@ -85,12 +85,15 @@ exit 0 %defattr(-,root,root) %doc COPYING README %{_sysconfdir}/cron.daily/0yum.cron -%{_sysconfdir}/yum/yum-daily.yum -%{_sysconfdir}/yum/yum-weekly.yum +%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 +* Mon Dec 27 2010 Jason L Tibbitts III - 0.9.2-2 +- Mark /etc/yum/yum-*.yum as config files so updates don't wipe them out. + * 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) From 78d3903ddb14bceeb09d8e6016b7e07fe57a5846 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:21:58 -0600 Subject: [PATCH 5/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- yum-cron.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index 6fc67d6..b6d5b55 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.9.2 -Release: 2%{?dist} +Release: 3%{?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,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Dec 27 2010 Jason L Tibbitts III - 0.9.2-2 - Mark /etc/yum/yum-*.yum as config files so updates don't wipe them out. From d6074e82e3faf01df9dd02f2e2267e74719259a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:31:12 -0600 Subject: [PATCH 6/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- yum-cron.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index b6d5b55..d1899e0 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.9.2 -Release: 3%{?dist} +Release: 4%{?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,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 30f66f183067fdd1a3b32c03d50f88efd2b17274 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:49:08 -0500 Subject: [PATCH 7/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- yum-cron.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index d1899e0..18ca313 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.9.2 -Release: 4%{?dist} +Release: 5%{?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,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 54d08743463ceed35f52030de035248b1366868f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 23 Nov 2012 11:05:48 +0100 Subject: [PATCH 8/9] The requirement on vixie-cron is not correct anymore. The dailyjobs will be used as virtual requirement since now. #879550 --- yum-cron.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yum-cron.spec b/yum-cron.spec index 18ca313..d444133 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.9.2 -Release: 5%{?dist} +Release: 6%{?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 findutils +Requires: yum >= 3.0 dailyjobs crontabs yum-downloadonly findutils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -91,6 +91,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* Fri Nov 23 2012 Marcela Mašláňová - 0.9.2-6 +- The requirement on vixie-cron is not correct anymore. The dailyjobs will be + used as virtual requirement since now. #879550 + * Sun Jul 22 2012 Fedora Release Engineering - 0.9.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 2f259c291e8adfa780513e6700fcf016de2cd08a Mon Sep 17 00:00:00 2001 From: James Antill Date: Wed, 5 Dec 2012 15:40:56 -0500 Subject: [PATCH 9/9] Moved into the yum package. --- .gitignore | 1 - dead.package | 1 + sources | 1 - yum-cron.spec | 207 -------------------------------------------------- 4 files changed, 1 insertion(+), 209 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 yum-cron.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5322070..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -yum-cron-0.9.2.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..93fbe45 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Moved into the yum package. diff --git a/sources b/sources deleted file mode 100644 index 6d4e049..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -c97f4de4c6b95ff130636298edcfdc71 yum-cron-0.9.2.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec deleted file mode 100644 index d444133..0000000 --- a/yum-cron.spec +++ /dev/null @@ -1,207 +0,0 @@ -Summary: Files needed to run yum updates as a cron job -Name: yum-cron -Version: 0.9.2 -Release: 6%{?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 -# within this srpm. -Source0: %{name}-%{version}.tar.gz -License: GPLv2 -Group: System Environment/Base -BuildArch: noarch -Requires: yum >= 3.0 dailyjobs crontabs yum-downloadonly findutils -Requires(post): /sbin/chkconfig -Requires(post): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -%description -These are the files needed to run yum updates as a cron job. They -originated in yum-2.6.1-0.fc5, but were left out of FC6's yum. -Install this package if you want auto yum updates nightly via cron -rather than the newer yum-updatesd daemon. - -%prep -%setup -q - -%build - -%install -rm -rf $RPM_BUILD_ROOT -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 -rm -rf $RPM_BUILD_ROOT - -%post -# Make sure chkconfig knows about the service -/sbin/chkconfig --add yum-cron -# if an upgrade: -if [ "$1" -ge "1" ]; then -# if there's a /etc/rc.d/init.d/yum file left, assume that there was an -# older instance of yum-cron which used this naming convention. Clean -# it up, do a conditional restart - if [ -f /etc/init.d/yum ]; then -# was it on? - /sbin/chkconfig yum - RETVAL=$? - if [ $RETVAL = 0 ]; then -# if it was, stop it, then turn on new yum-cron - /sbin/service yum stop 1> /dev/null 2>&1 - /sbin/service yum-cron start 1> /dev/null 2>&1 - /sbin/chkconfig yum-cron on - fi -# remove it from the service list - /sbin/chkconfig --del yum - fi -fi -exit 0 - -%preun -# if this will be a complete removeal of yum-cron rather than an upgrade, -# remove the service from chkconfig control -if [ $1 = 0 ]; then - /sbin/chkconfig --del yum-cron - /sbin/service yum-cron stop 1> /dev/null 2>&1 -fi -exit 0 - -%postun -# If there's a yum-cron package left after uninstalling one, do a -# conditional restart of the service -if [ "$1" -ge "1" ]; then - /sbin/service yum-cron condrestart 1> /dev/null 2>&1 -fi -exit 0 - -%files -%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}/rc.d/init.d/yum-cron -%config(noreplace) %{_sysconfdir}/sysconfig/yum-cron - -%changelog -* Fri Nov 23 2012 Marcela Mašláňová - 0.9.2-6 -- The requirement on vixie-cron is not correct anymore. The dailyjobs will be - used as virtual requirement since now. #879550 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.9.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 27 2010 Jason L Tibbitts III - 0.9.2-2 -- Mark /etc/yum/yum-*.yum as config files so updates don't wipe them out. - -* 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 - 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 - 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 - -* 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 -- 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 - -* Wed Mar 5 2008 Alec Habig - 0.8.1-1 -- Fix bugs 429716 and 435968 - -* Wed Feb 20 2008 Alec Habig - 0.8-1 -- Change tmp dir to /var/run (bug 431588) -- add DAYS_OF_WEEK and CHECK_FIRST config options (bug 429716) -- fix CHECK_ONLY thinking updates are present on repository problems (bug 431321) - -* Tue Jan 8 2008 Alec Habig - 0.7-1 -- Add DEBUG_LEVEL, ERROR_LEVEL sysconfig options (bug 426047) -- Add MAILTO, RANDOMWAIT, and SYSTEMNAME sysconfig options (bug 426755) - -* Mon Oct 15 2007 Alec Habig - 0.6-1 -- Fixes for bug 327401: checkonly formatting fix and make lockfile - grabbing an atomic action using mkdir instead of touch -- Added downloadonly option (bug 333131) -- Don't update yum if set to checkonly (bug 333111) - -* Sat Sep 29 2007 Alec Habig - 0.5-1 -- Added a lockfile to prevent multiple instances of the cron scripts - from running and hanging, see bug 311661 - -* Mon Sep 3 2007 Alec Habig - 0.4-1 -- Fix bug in cron.daily which was preventing updates from running -- Integrate Frank's checkonly patches into the source - -* Mon Aug 27 2007 Frank Wittig - 0.3-3 -- Actual update action is now configurable. It does check-only now if - configured. Default behaviour is to do updates. - -* Tue Aug 21 2007 Alec Habig - 0.3-2 -- Changed over to dist tags, to play more nciely with the Fedora build system -- License changed "GPL" to "GPLv2" since rpmlint now cares - -* Mon Aug 20 2007 Alec Habig - 0.3-1 -- Bumped version for release to fedora-extras - -* Mon Jul 30 2007 Alec Habig - 0.2-5 -- spec file updates in response to review. - -* Thu Jun 28 2007 Alec Habig - 0.2-4 -- Check for existence of old "yum"-named init script. If so, assume - it's an upgrade, remove them, and do a condrestart. - -* Tue Jun 19 2007 Alec Habig - 0.2-3 -- the yum-daily.yum script marked noreplace since it's a config-y file. - Not so sure we want to do this, but it keeps rpmlint happy. -- service starting/stopping changed to conform to standards. - -* Tue Jun 19 2007 Alec Habig - 0.2-2 -- More specfile work, functionality and installed files not changed - -* Tue Jun 19 2007 Alec Habig - 0.2-1 -- Upgrade spec file to meet fedora-extras requirements -- rename init script yum-cron to meet rpmlint guidelines -- See bugzilla #212507 for the history of this package - -* Tue Oct 31 2006 Alec Habig - 0.1-1 -- Initial packaging of old scripts as a standalone rpm for use in FC6