From ba1d6c2b31770a63e53e4423b62e713d2b8c374d Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 21 Aug 2007 18:44:39 +0000 Subject: [PATCH 01/26] initial import --- .cvsignore | 1 + sources | 1 + yum-cron.spec | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 yum-cron.spec diff --git a/.cvsignore b/.cvsignore index e69de29..159e183 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +yum-cron-0.3.tar.gz diff --git a/sources b/sources index e69de29..b559aa8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b232b7066f6bf846c20597bdba076346 yum-cron-0.3.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec new file mode 100644 index 0000000..ccc8992 --- /dev/null +++ b/yum-cron.spec @@ -0,0 +1,116 @@ +Summary: Files needed to run yum updates as a cron job +Name: yum-cron +Version: 0.3 +Release: 1 +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: GPL +Group: System Environment/Base +BuildArch: noarch +Requires: yum >= 3.0 vixie-cron crontabs +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 are +lifted straight from 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 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 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 + +%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/yum.cron +%{_sysconfdir}/cron.weekly/yum.cron +%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum +%{_sysconfdir}/rc.d/init.d/yum-cron + +%changelog +* 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 From 3678cce3166ebabb1a56f1bd98c097ff423ce57f Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 21 Aug 2007 19:17:31 +0000 Subject: [PATCH 02/26] Adding dist tags universally --- yum-cron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index ccc8992..47c90d9 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.3 -Release: 1 +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 From 4b6eebdd1706c92b8d5359169a60929802fef4df Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 21 Aug 2007 19:56:40 +0000 Subject: [PATCH 03/26] GPL -> GPLv2 --- yum-cron.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yum-cron.spec b/yum-cron.spec index 47c90d9..e444973 100644 --- a/yum-cron.spec +++ b/yum-cron.spec @@ -1,13 +1,13 @@ Summary: Files needed to run yum updates as a cron job Name: yum-cron Version: 0.3 -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 # within this srpm. Source0: %{name}-%{version}.tar.gz -License: GPL +License: GPLv2 Group: System Environment/Base BuildArch: noarch Requires: yum >= 3.0 vixie-cron crontabs @@ -89,6 +89,10 @@ exit 0 %{_sysconfdir}/rc.d/init.d/yum-cron %changelog +* 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 From 73544eeafb04834918b8e4c25d0982b4e524514f Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 28 Aug 2007 15:19:53 +0000 Subject: [PATCH 04/26] Added Frank Wittig's patch to set check-only via an entry in the new file /etc/sysconfig/yum-cron --- yum-cron-0.3.checkonly.patch | 32 ++++++++++++++++++++++++++++++++ yum-cron.spec | 10 +++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 yum-cron-0.3.checkonly.patch diff --git a/yum-cron-0.3.checkonly.patch b/yum-cron-0.3.checkonly.patch new file mode 100644 index 0000000..434d4ef --- /dev/null +++ b/yum-cron-0.3.checkonly.patch @@ -0,0 +1,32 @@ +diff -Naur yum-cron-0.3/yum.cron.daily yum-cron-0.3_wwk/yum.cron.daily +--- yum-cron-0.3/yum.cron.daily 2007-06-19 17:34:58.000000000 +0200 ++++ yum-cron-0.3_wwk/yum.cron.daily 2007-08-27 10:59:34.000000000 +0200 +@@ -1,6 +1,20 @@ + #!/bin/sh + +-if [ -f /var/lock/subsys/yum-cron ]; then ++if [ -f /var/lock/subsys/yum ]; then ++ ++ if [ -f /etc/sysconfig/yum-cron ]; then ++ source /etc/sysconfig/yum-cron ++ fi ++ + /usr/bin/yum -R 120 -e 0 -d 0 -y update yum +- /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum ++ ++ if [[ "x$CHECK_ONLY" == "xyes" ]]; then ++ if (! /usr/bin/yum -R 10 -e 0 -d 0 -y check-update >/dev/null); then ++ echo "New updates available for host `/bin/hostname`"; ++ echo "`/usr/bin/yum -e 0 -d 0 -y -C check-update`^M" ++ fi ++ else ++ /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum ++ fi ++ + fi +diff -Naur yum-cron-0.3/yum-cron.sysconf yum-cron-0.3_wwk/yum-cron.sysconf +--- yum-cron-0.3/yum-cron.sysconf 1970-01-01 01:00:00.000000000 +0100 ++++ yum-cron-0.3_wwk/yum-cron.sysconf 2007-08-27 11:46:51.000000000 +0200 +@@ -0,0 +1,2 @@ ++# Don't install, just check (valid: yes|no) ++CHECK_ONLY=no diff --git a/yum-cron.spec b/yum-cron.spec index e444973..b983666 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.3 -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 @@ -17,6 +17,7 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: yum-cron-0.3.checkonly.patch %description These are the files needed to run yum updates as a cron job. They are @@ -26,6 +27,7 @@ rather than the newer yum-updatesd daemon. %prep %setup -q +%patch0 -p1 %build @@ -35,6 +37,7 @@ install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.c install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.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-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron %clean rm -rf $RPM_BUILD_ROOT @@ -87,8 +90,13 @@ exit 0 %{_sysconfdir}/cron.weekly/yum.cron %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum %{_sysconfdir}/rc.d/init.d/yum-cron +%config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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 From 132cf7498de54fbb99bd9e214f46af37ab5aead4 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Mon, 3 Sep 2007 14:52:22 +0000 Subject: [PATCH 05/26] Fix cron.daily bug which was skippin gupdates, integrate checkonly patch into source tarball. --- .cvsignore | 2 +- sources | 2 +- yum-cron-0.3.checkonly.patch | 32 -------------------------------- yum-cron.spec | 14 ++++++++------ 4 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 yum-cron-0.3.checkonly.patch diff --git a/.cvsignore b/.cvsignore index 159e183..291660a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.3.tar.gz +yum-cron-0.4.tar.gz diff --git a/sources b/sources index b559aa8..a8bf46c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b232b7066f6bf846c20597bdba076346 yum-cron-0.3.tar.gz +113c9dda502f7526479d2c416f3f9085 yum-cron-0.4.tar.gz diff --git a/yum-cron-0.3.checkonly.patch b/yum-cron-0.3.checkonly.patch deleted file mode 100644 index 434d4ef..0000000 --- a/yum-cron-0.3.checkonly.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur yum-cron-0.3/yum.cron.daily yum-cron-0.3_wwk/yum.cron.daily ---- yum-cron-0.3/yum.cron.daily 2007-06-19 17:34:58.000000000 +0200 -+++ yum-cron-0.3_wwk/yum.cron.daily 2007-08-27 10:59:34.000000000 +0200 -@@ -1,6 +1,20 @@ - #!/bin/sh - --if [ -f /var/lock/subsys/yum-cron ]; then -+if [ -f /var/lock/subsys/yum ]; then -+ -+ if [ -f /etc/sysconfig/yum-cron ]; then -+ source /etc/sysconfig/yum-cron -+ fi -+ - /usr/bin/yum -R 120 -e 0 -d 0 -y update yum -- /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum -+ -+ if [[ "x$CHECK_ONLY" == "xyes" ]]; then -+ if (! /usr/bin/yum -R 10 -e 0 -d 0 -y check-update >/dev/null); then -+ echo "New updates available for host `/bin/hostname`"; -+ echo "`/usr/bin/yum -e 0 -d 0 -y -C check-update`^M" -+ fi -+ else -+ /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum -+ fi -+ - fi -diff -Naur yum-cron-0.3/yum-cron.sysconf yum-cron-0.3_wwk/yum-cron.sysconf ---- yum-cron-0.3/yum-cron.sysconf 1970-01-01 01:00:00.000000000 +0100 -+++ yum-cron-0.3_wwk/yum-cron.sysconf 2007-08-27 11:46:51.000000000 +0200 -@@ -0,0 +1,2 @@ -+# Don't install, just check (valid: yes|no) -+CHECK_ONLY=no diff --git a/yum-cron.spec b/yum-cron.spec index b983666..019d37d 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.3 -Release: 3%{?dist} +Version: 0.4 +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 @@ -17,17 +17,15 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Patch0: yum-cron-0.3.checkonly.patch %description -These are the files needed to run yum updates as a cron job. They are -lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum. +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 -%patch0 -p1 %build @@ -93,6 +91,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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. From 60d9135fe7cfe3f6cc0bd12fefe45862d4bf2d1b Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Sun, 30 Sep 2007 15:50:30 +0000 Subject: [PATCH 06/26] Added a lockfile to prevent multiple instances of the cron scripts from running and hanging, see bug 311661 --- .cvsignore | 2 +- sources | 2 +- yum-cron.spec | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 291660a..c3e34d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.4.tar.gz +yum-cron-0.5.tar.gz diff --git a/sources b/sources index a8bf46c..929e2dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -113c9dda502f7526479d2c416f3f9085 yum-cron-0.4.tar.gz +b0b615a66f69c770ae2cfb78700b14e6 yum-cron-0.5.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 019d37d..45d029b 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.4 +Version: 0.5 Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to @@ -91,6 +91,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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 From 7edf0cda1a216dc248595fff1f38712d3100363f Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 16 Oct 2007 15:04:29 +0000 Subject: [PATCH 07/26] Bugfixes. --- .cvsignore | 2 +- sources | 2 +- yum-cron.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c3e34d8..5675372 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.5.tar.gz +yum-cron-0.6.tar.gz diff --git a/sources b/sources index 929e2dc..3b328c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0b615a66f69c770ae2cfb78700b14e6 yum-cron-0.5.tar.gz +72a8259220d8e584a5b8c0473b63ff71 yum-cron-0.6.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 45d029b..b63a627 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.5 +Version: 0.6 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 +Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly 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 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 From 23bee07305cd7bb6f767feb182c2ddac577ace24 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 9 Jan 2008 17:40:50 +0000 Subject: [PATCH 08/26] Added new logging options. --- .cvsignore | 2 +- sources | 2 +- yum-cron.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5675372..77e9329 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.6.tar.gz +yum-cron-0.7.tar.gz diff --git a/sources b/sources index 3b328c9..2ae6d29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72a8259220d8e584a5b8c0473b63ff71 yum-cron-0.6.tar.gz +ca247a404ac604d84f06b8a428c95648 yum-cron-0.7.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index b63a627..16396d9 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.6 +Version: 0.7 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 +Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx 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 +* 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 From 929dcf712b129f7bc5d532db14efc20815910e66 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Thu, 21 Feb 2008 14:21:26 +0000 Subject: [PATCH 09/26] 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) --- .cvsignore | 2 +- sources | 2 +- yum-cron.spec | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 77e9329..8b82775 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.7.tar.gz +yum-cron-0.8.tar.gz diff --git a/sources b/sources index 2ae6d29..1277679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca247a404ac604d84f06b8a428c95648 yum-cron-0.7.tar.gz +6728d59066d193853c03566a196fa6c0 yum-cron-0.8.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index 16396d9..c74e5c3 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.7 +Version: 0.8 Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to @@ -91,6 +91,11 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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) From 85fe604a63a1a8af31838249b286497061172f69 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Thu, 13 Mar 2008 18:58:29 +0000 Subject: [PATCH 10/26] 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 --- .cvsignore | 2 +- sources | 2 +- yum-cron.spec | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8b82775..4e73716 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yum-cron-0.8.tar.gz +yum-cron-0.8.2.tar.gz diff --git a/sources b/sources index 1277679..7614bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6728d59066d193853c03566a196fa6c0 yum-cron-0.8.tar.gz +d824c4bfc76daa5040f77b3bbc39556e yum-cron-0.8.2.tar.gz diff --git a/yum-cron.spec b/yum-cron.spec index c74e5c3..6a74fba 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 +Version: 0.8.2 Release: 1%{?dist} URL: http://linux.duke.edu/yum/ # This is a Red Hat maintained package which is specific to @@ -91,6 +91,12 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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) From 92d46b42d93e1e32b023df7cd6b4f6df140dcc78 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Sun, 14 Dec 2008 23:08:39 +0000 Subject: [PATCH 11/26] - 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..18d0ea6 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060 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 6f8ac8202e90e8eb547fe72688109fcd390b2503 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:22:33 +0000 Subject: [PATCH 12/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- yum-cron.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index 17e0976..b404128 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} +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,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog +* 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 fc954e29a46507995b20844583d2835b796d76dd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:57:11 +0000 Subject: [PATCH 13/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- yum-cron.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yum-cron.spec b/yum-cron.spec index b404128..1aa791b 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: 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 +* Mon Jul 27 2009 Fedora Release Engineering - 0.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ca4d1b4a37881823283b46a8e84cb04f2fff9ca9 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 11 Aug 2009 00:04:53 +0000 Subject: [PATCH 14/26] Add ability to check for stale locks to the cron scripts. --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- yum-cron.spec | 8 ++++---- 4 files changed, 7 insertions(+), 6 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 18d0ea6..a221b19 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ 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 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 1aa791b..cfff14f 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: 3%{?dist} +Version: 0.8.4 +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 @@ -91,8 +91,8 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron %changelog -* Mon Jul 27 2009 Fedora Release Engineering - 0.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* 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 From e90020627d836cc7f48e71152ebd6e7be9efc503 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Fri, 21 Aug 2009 19:30:56 +0000 Subject: [PATCH 15/26] deal with stale lockdirs, bug 515814 --- import.log | 1 + yum-cron.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index a221b19..f0aa146 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ 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 diff --git a/yum-cron.spec b/yum-cron.spec index cfff14f..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.4 -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 @@ -91,6 +91,9 @@ 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 From ec22c074909d00d6d41bab946cafe6a8a107cea1 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Tue, 6 Oct 2009 22:15:06 +0000 Subject: [PATCH 16/26] - 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. --- .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..6d06f96 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:HEAD:yum-cron-0.9.0-1.fc11.src.rpm:1254867260 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 fec80d4cb856ec02a8e7350c592ba8dc89c9ae84 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 14 Oct 2009 13:35:21 +0000 Subject: [PATCH 17/26] - 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 6d06f96..3b35a4a 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: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 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 e003fe1e2586f5cf468b455d36dc046a70913bc2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:36 +0000 Subject: [PATCH 18/26] 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 0414f68fd633ddc59b2ae1430edf98255c4a6681 Mon Sep 17 00:00:00 2001 From: Alec Thomas Habig Date: Wed, 10 Feb 2010 21:22:09 +0000 Subject: [PATCH 19/26] - 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 3b35a4a..3a41ec9 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: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 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 3a1db30cd21d33063557bc793d6858c9bbcde6db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:26:00 +0000 Subject: [PATCH 20/26] 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 21/26] 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 22/26] - 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 23/26] - 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 24/26] - 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 25/26] 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 26/26] 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