From 0ae51a88ce43645dac87c012fb1c46c062f34be8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:02:15 +0000 Subject: [PATCH 01/23] Initialize branch F-11 for and --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 7c2cc1b527f6de8a3df205d282dd0901ae2c2f0c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:52:22 +0000 Subject: [PATCH 02/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index da42aa5..a5f1a60 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -82,6 +82,9 @@ fi %{_mandir}/man8/*.gz %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 1.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From a07cdfb86126e6909741da1d5fa0ef4109f3c676 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:44 +0000 Subject: [PATCH 03/23] 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 c4c0164..b2aa447 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: and -# $Id$ +# $Id: Makefile,v 1.1 2007/07/30 18:39:10 tibbs Exp $ NAME := and 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 7265437a0c1498b31b865a46043d21f4c4aad024 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:38 +0000 Subject: [PATCH 04/23] 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 c4c0164..b2aa447 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: and -# $Id$ +# $Id: Makefile,v 1.1 2007/07/30 18:39:10 tibbs Exp $ NAME := and 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 a14f6ced363007dd0bc27fafb9be5dbb2d1cac56 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 18 Jul 2010 19:18:46 +0000 Subject: [PATCH 05/23] Try to support systemd --- and.service | 9 ++++++ and.spec | 81 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 and.service diff --git a/and.service b/and.service new file mode 100644 index 0000000..5bbf0a4 --- /dev/null +++ b/and.service @@ -0,0 +1,9 @@ +[Unit] +Description=auto nice daemon +After=syslog.target + +[Service] +ExecStart=/usr/sbin/and + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/and.spec b/and.spec index a5f1a60..ac776f8 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -10,14 +10,12 @@ URL: http://and.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: and.init Source2: and.sysconf +Source3: and.service Patch1: and-1.2.2-makefile.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -Requires(post): /sbin/chkconfig -Requires(postun): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service +Requires: init(%{name}) %description The auto nice daemon renices and even kills jobs according to their CPU time, @@ -25,6 +23,50 @@ owner, and command name. This is especially useful on production machines with lots of concurrent CPU-intensive jobs and users that tend to forget to nice their jobs. +%package sysvinit +Summary: SysV initscripts for and +License: GPLv2 +Group: System Environment/Daemons + +Requires(post): %{name} /sbin/chkconfig +Requires(postun): %{name} /sbin/service +Requires(preun): %{name} /sbin/chkconfig +Requires(preun): %{name} /sbin/service + +Provides: init(%{name}) = sysv + +Buildarch: noarch + +%description sysvinit +The auto nice daemon renices and even kills jobs according to their CPU time, +owner, and command name. This is especially useful on production machines with +lots of concurrent CPU-intensive jobs and users that tend to forget to +nice their jobs. + +This package provides initscripts for the SysV init system. + +%package units +Summary: systemd units for and +License: GPLv2 +Group: System Environment/Daemons + +Requires(post): %{name} systemd-units +Requires(postun): %{name} systemd-units +Requires(preun): %{name} systemd-units +Requires(preun): %{name} systemd-units + +Provides: init(%{name}) = systemd + +Buildarch: noarch + +%description units +The auto nice daemon renices and even kills jobs according to their CPU time, +owner, and command name. This is especially useful on production machines with +lots of concurrent CPU-intensive jobs and users that tend to forget to +nice their jobs. + +This package provides a services file for the systemd init system. + %prep %setup1 -q %patch1 -p1 -b .org @@ -54,34 +96,55 @@ install -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/and mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/and +mkdir -p %{buildroot}/lib/systemd/system +install -p -m 0644 %{SOURCE3} %{buildroot}/lib/systemd/system + %clean rm -rf %{buildroot} -%post +%post sysvinit /sbin/chkconfig --add and -%preun +%preun sysvinit if [ $1 -eq 0 ]; then /sbin/service and stop >/dev/null 2>&1 || : /sbin/chkconfig --del and fi -%postun +%postun sysvinit if [ $1 -ge 1 ]; then /sbin/service and condrestart >/dev/null fi +%post units +/usr/bin/systemd-install --realize=minimal enable amd.service >/dev/null 2>&1 || : + +%preun units +if [$1 -eq ß ]; then + /usr/bin/system-install --realize disable amd.service &1 || : +fi + %files %defattr(-,root,root) %doc README LICENSE CHANGELOG %config(noreplace) %{_sysconfdir}/and/ %config(noreplace) %{_sysconfdir}/sysconfig/and %{_sbindir}/* -%attr(0755,root,root) %{_initrddir}/and %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz +%files sysvinit +%defattr(-,root,root) +%attr(0755,root,root) %{_initrddir}/and + +%files units +%defattr(-,root,root) +/lib/systemd/system/and.service + %changelog +* Sun Jul 18 2010 Jochen Schmitt - 1.2.2-9 +- Try to add systemd support + * Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 308a61b100e6d76e3a674751fd7d6d8a70f7a683 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:59:44 +0000 Subject: [PATCH 06/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 b2aa447..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: and -# $Id: Makefile,v 1.1 2007/07/30 18:39:10 tibbs Exp $ -NAME := and -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) From d32d1a8707d7b4ab9118a26759ba5e5b966cb35c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:59:46 +0000 Subject: [PATCH 07/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 b2aa447..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: and -# $Id: Makefile,v 1.1 2007/07/30 18:39:10 tibbs Exp $ -NAME := and -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From 3afd1c12f80b9ec040ac5a7121c943c660109967 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Sun, 28 Nov 2010 21:13:19 +0100 Subject: [PATCH 08/23] - Remove SysVInit support --- and.init | 83 -------------------------------------------------- and.spec | 92 +++++++++----------------------------------------------- 2 files changed, 15 insertions(+), 160 deletions(-) delete mode 100644 and.init diff --git a/and.init b/and.init deleted file mode 100644 index 05ee218..0000000 --- a/and.init +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/init.d/and, /sbin/init.d/and, /etc/init.d/and -# -# SysV init.d compliant startup script for auto nice daemon. -# -# 1999, 2000, 2001 Patrick Schemitz -# http://and.sourceforge.net/ -# -# chkconfig: - 90 10 -# description: automatically renice and kill jobs. -# -# processname: and -# config: /etc/and.conf -# - -### BEGIN INIT INFO -# Provides: and -# Required-Start: $syslog -# Required-Stop: -# Default-Stop: 0 6 -# Short-Description: Automatically renice and kill jobs -# Description: Autmatically renice and kill jobs -### END INIT INFO - -prog=and -and_bin=/usr/sbin/and -and_conf=/etc/and/and.conf - -. /etc/rc.d/init.d/functions - -AND_FLAGS="" -test -r /etc/sysconfig/and && . /etc/sysconfig/and - -start() { - echo -n $"Starting auto nice daemon:" - daemon /usr/sbin/and $AND_FLAGS >/dev/null 2>&1 - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog -} - -stop() { - echo -n $"Shutting down auto nice daemon:" - killproc and -QUIT - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -rf /var/lock/subsys/$prog -} - -restart() { - stop - start -} - -RETVAL=0 - -[ -x $and_bin -a -s $and_conf ] || exit 0 - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/$prog ] && restart || : - ;; - status) - status $prog - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $RETVAL \ No newline at end of file diff --git a/and.spec b/and.spec index ac776f8..96a8ae7 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -8,14 +8,17 @@ Group: System Environment/Daemons URL: http://and.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: and.init -Source2: and.sysconf -Source3: and.service +Source1: and.sysconf +Source2: and.service Patch1: and-1.2.2-makefile.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) -Requires: init(%{name}) +Obsoletes: and-sysvinit < %{version}-%{release} +Provides: and-sysvinit = %{version}-%{release} + +Obsoletes: and-units < %{version}-%{release} +Provides: and-units = %{version}-%{release} %description The auto nice daemon renices and even kills jobs according to their CPU time, @@ -23,50 +26,6 @@ owner, and command name. This is especially useful on production machines with lots of concurrent CPU-intensive jobs and users that tend to forget to nice their jobs. -%package sysvinit -Summary: SysV initscripts for and -License: GPLv2 -Group: System Environment/Daemons - -Requires(post): %{name} /sbin/chkconfig -Requires(postun): %{name} /sbin/service -Requires(preun): %{name} /sbin/chkconfig -Requires(preun): %{name} /sbin/service - -Provides: init(%{name}) = sysv - -Buildarch: noarch - -%description sysvinit -The auto nice daemon renices and even kills jobs according to their CPU time, -owner, and command name. This is especially useful on production machines with -lots of concurrent CPU-intensive jobs and users that tend to forget to -nice their jobs. - -This package provides initscripts for the SysV init system. - -%package units -Summary: systemd units for and -License: GPLv2 -Group: System Environment/Daemons - -Requires(post): %{name} systemd-units -Requires(postun): %{name} systemd-units -Requires(preun): %{name} systemd-units -Requires(preun): %{name} systemd-units - -Provides: init(%{name}) = systemd - -Buildarch: noarch - -%description units -The auto nice daemon renices and even kills jobs according to their CPU time, -owner, and command name. This is especially useful on production machines with -lots of concurrent CPU-intensive jobs and users that tend to forget to -nice their jobs. - -This package provides a services file for the systemd init system. - %prep %setup1 -q %patch1 -p1 -b .org @@ -90,36 +49,19 @@ make PREFIX=%{buildroot}%{_prefix} \ INSTALL_SBIN=%{buildroot}%{_sbindir} \ INSTALL_MAN=%{buildroot}%{_mandir} install -mkdir -p %{buildroot}%{_initrddir} -install -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/and - mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/and +install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/and mkdir -p %{buildroot}/lib/systemd/system -install -p -m 0644 %{SOURCE3} %{buildroot}/lib/systemd/system +install -p -m 0644 %{SOURCE2} %{buildroot}/lib/systemd/system %clean rm -rf %{buildroot} -%post sysvinit -/sbin/chkconfig --add and - -%preun sysvinit -if [ $1 -eq 0 ]; then - /sbin/service and stop >/dev/null 2>&1 || : - /sbin/chkconfig --del and -fi - -%postun sysvinit -if [ $1 -ge 1 ]; then - /sbin/service and condrestart >/dev/null -fi - -%post units +%post /usr/bin/systemd-install --realize=minimal enable amd.service >/dev/null 2>&1 || : -%preun units +%preun if [$1 -eq ß ]; then /usr/bin/system-install --realize disable amd.service &1 || : fi @@ -132,16 +74,12 @@ fi %{_sbindir}/* %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz - -%files sysvinit -%defattr(-,root,root) -%attr(0755,root,root) %{_initrddir}/and - -%files units -%defattr(-,root,root) /lib/systemd/system/and.service %changelog +* Sun Nov 28 2010 Jochen Schmitt - 1.2.2-10 +- Remove SysVInit support + * Sun Jul 18 2010 Jochen Schmitt - 1.2.2-9 - Try to add systemd support From 3c6256646a4b5b136b0b4ebf3f34e2f4390b1882 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:10:47 -0600 Subject: [PATCH 09/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 96a8ae7..ccd7bbf 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -77,6 +77,9 @@ fi /lib/systemd/system/and.service %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Nov 28 2010 Jochen Schmitt - 1.2.2-10 - Remove SysVInit support From 45ebfe11eba44115307c03168c2a688151061871 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Thu, 31 Mar 2011 22:02:09 +0200 Subject: [PATCH 10/23] Rework for systemd --- and.spec | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/and.spec b/and.spec index ccd7bbf..93c6a53 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -20,6 +20,21 @@ Provides: and-sysvinit = %{version}-%{release} Obsoletes: and-units < %{version}-%{release} Provides: and-units = %{version}-%{release} +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + +provides: and-sysvinit = %{version}-%{release} +Obsoletes: and-sysvinit < 1.2.2-11 + +provides: and-units = %{version}-%{release} +Obsoletes: and-units < 1.2.2-11 + + +Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) + %description The auto nice daemon renices and even kills jobs according to their CPU time, owner, and command name. This is especially useful on production machines with @@ -52,18 +67,26 @@ make PREFIX=%{buildroot}%{_prefix} \ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/and -mkdir -p %{buildroot}/lib/systemd/system -install -p -m 0644 %{SOURCE2} %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}%{_unitdir} +install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %clean rm -rf %{buildroot} %post -/usr/bin/systemd-install --realize=minimal enable amd.service >/dev/null 2>&1 || : +if [ $1 -eq 1 ]; then + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [$1 -eq ß ]; then - /usr/bin/system-install --realize disable amd.service &1 || : +if [ $1 -eq 1 ]; then + /bin/systemctl --no-reload disable and.service >/dev/null 2>&1 || : + /bin/systemctl stop and.service >/dev/null 2>&1 || : +fi + +%postun +if [ $0 -en 0 ]; then + /bin/systemctl try-restart and.service >/dev/null 2>&1 || : fi %files @@ -74,16 +97,19 @@ fi %{_sbindir}/* %{_mandir}/man5/*.gz %{_mandir}/man8/*.gz -/lib/systemd/system/and.service +%{_unitdir}/and.service %changelog +* Thu Mar 31 2011 Jochen Schmitt 1.2.2-12 +- Rework for systemd + * Mon Feb 07 2011 Fedora Release Engineering - 1.2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Sun Nov 28 2010 Jochen Schmitt - 1.2.2-10 +* Sun Nov 28 2010 Jochen Schmitt 1.2.2-10 - Remove SysVInit support -* Sun Jul 18 2010 Jochen Schmitt - 1.2.2-9 +* Sun Jul 18 2010 Jochen Schmitt 1.2.2-9 - Try to add systemd support * Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-8 From 9c78ee54986b6de9cd9f5795661074deeb7847de Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Wed, 15 Jun 2011 21:29:15 +0200 Subject: [PATCH 11/23] Rework and.service to fix #713432 --- and.service | 6 +++++- and.spec | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/and.service b/and.service index 5bbf0a4..67a706d 100644 --- a/and.service +++ b/and.service @@ -3,7 +3,11 @@ Description=auto nice daemon After=syslog.target [Service] -ExecStart=/usr/sbin/and +Type=forking +EnvironmentFile=/etc/sysconfig/and +ExecStart=/usr/sbin/and $AND_FLAGS +StandardOutput=syslog +StandardError=syslog [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/and.spec b/and.spec index 93c6a53..1363ee1 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -100,6 +100,9 @@ fi %{_unitdir}/and.service %changelog +* Wed Jun 15 2011 Jochen Schmitt 1.2.2-13 +- Rework and.service to fix #713432 + * Thu Mar 31 2011 Jochen Schmitt 1.2.2-12 - Rework for systemd From 3a36edcf43305c244c68d1314ace271af2222c8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 18:35:42 -0500 Subject: [PATCH 12/23] - Rebuilt for glibc bug#747377 --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 1363ee1..eb09af1 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -100,6 +100,9 @@ fi %{_unitdir}/and.service %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 1.2.2-14 +- Rebuilt for glibc bug#747377 + * Wed Jun 15 2011 Jochen Schmitt 1.2.2-13 - Rework and.service to fix #713432 From 2cadcc3069f0d6d3c75baa67285f8a6ca409e09f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:16:11 -0600 Subject: [PATCH 13/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index eb09af1..15430c5 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -100,6 +100,9 @@ fi %{_unitdir}/and.service %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Oct 26 2011 Fedora Release Engineering - 1.2.2-14 - Rebuilt for glibc bug#747377 From 54b54fd76ffa27358c054e2209e2ce4dff1617f5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 26 Jul 2012 23:39:31 -0500 Subject: [PATCH 14/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 15430c5..8eb737b 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -100,6 +100,9 @@ fi %{_unitdir}/and.service %changelog +* Fri Jul 27 2012 Fedora Release Engineering - 1.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1.2.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f1b0df5dcd6a52420bf8eaa576213de773a119b8 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Tue, 28 Aug 2012 17:28:35 +0200 Subject: [PATCH 15/23] Fix misprint operator in %post stanza (#852419) --- and.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/and.spec b/and.spec index 8eb737b..e5eaf73 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -85,7 +85,7 @@ if [ $1 -eq 1 ]; then fi %postun -if [ $0 -en 0 ]; then +if [ $0 -ne 0 ]; then /bin/systemctl try-restart and.service >/dev/null 2>&1 || : fi @@ -100,6 +100,9 @@ fi %{_unitdir}/and.service %changelog +* Tue Aug 28 2012 Jochen Schmitt 1.2.2-17 +- Fix misprint operator in %%post stanza (#852419) + * Fri Jul 27 2012 Fedora Release Engineering - 1.2.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 71ca98087cb9c59fbf9f1ec3b576e8334dec3492 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Fri, 5 Oct 2012 19:41:13 +0200 Subject: [PATCH 16/23] Introduction of rpm systemd macros - Clean up of the SPEC file --- and.spec | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/and.spec b/and.spec index e5eaf73..935b060 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -12,8 +12,6 @@ Source1: and.sysconf Source2: and.service Patch1: and-1.2.2-makefile.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) - Obsoletes: and-sysvinit < %{version}-%{release} Provides: and-sysvinit = %{version}-%{release} @@ -54,7 +52,6 @@ make %{?_smp_mflags} \ INSTALL_MAN=%{_mandir} %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_mandir}/man8 @@ -70,24 +67,14 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/and mkdir -p %{buildroot}%{_unitdir} install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} -%clean -rm -rf %{buildroot} - %post -if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post and.service %preun -if [ $1 -eq 1 ]; then - /bin/systemctl --no-reload disable and.service >/dev/null 2>&1 || : - /bin/systemctl stop and.service >/dev/null 2>&1 || : -fi +%systemd_preun and.service %postun -if [ $0 -ne 0 ]; then - /bin/systemctl try-restart and.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart and.service %files %defattr(-,root,root) @@ -100,6 +87,10 @@ fi %{_unitdir}/and.service %changelog +* Fri Oct 5 2012 Jochen Schmitt - 1.2.2-18 +- Introduction of rpm systemd macros +- Clean up of the SPEC file + * Tue Aug 28 2012 Jochen Schmitt 1.2.2-17 - Fix misprint operator in %%post stanza (#852419) From 56fed0c1dc8e99b0476f8bcfc5d9ac4bdd4ad3f0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:32:13 -0600 Subject: [PATCH 17/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 935b060..1d9e0f9 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.2.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Oct 5 2012 Jochen Schmitt - 1.2.2-18 - Introduction of rpm systemd macros - Clean up of the SPEC file From 9aa19822ffdcbb7673b2574dd823d8555d5e86a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:47:04 -0500 Subject: [PATCH 18/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 1d9e0f9..750b605 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.2.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 579a5940778d75f4a9fbf19a838ff67972c6a888 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:40:58 -0500 Subject: [PATCH 19/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 750b605..c453125 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 05be825d08ab208160a4aad2ea472ffe2f1b3166 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:33:32 +0000 Subject: [PATCH 20/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index c453125..e67d2ca 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.2.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 77afe1f3700d39471521756eb62f7747967e51da Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:54:10 +0000 Subject: [PATCH 21/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index e67d2ca..3517c05 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.2.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 1.2.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From a67041f6aa03a7bd11bcc0f05348e2b66e29865f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:11:14 +0000 Subject: [PATCH 22/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- and.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/and.spec b/and.spec index 3517c05..ebc7f26 100644 --- a/and.spec +++ b/and.spec @@ -1,6 +1,6 @@ Name: and Version: 1.2.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Auto nice daemon License: GPLv2 @@ -87,6 +87,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} %{_unitdir}/and.service %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.2.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 1.2.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 8b2f8e417c37aa7eb47e073f47d44af5942d6412 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Tue, 13 Sep 2016 19:00:47 +0200 Subject: [PATCH 23/23] 2016-09-13: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - and-1.2.2-makefile.patch | 196 --------------------------------------- and.service | 13 --- and.spec | 161 -------------------------------- and.sysconf | 4 - dead.package | 3 + sources | 1 - 7 files changed, 3 insertions(+), 376 deletions(-) delete mode 100644 .gitignore delete mode 100644 and-1.2.2-makefile.patch delete mode 100644 and.service delete mode 100644 and.spec delete mode 100644 and.sysconf create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 676f47e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -and-1.2.2.tar.gz diff --git a/and-1.2.2-makefile.patch b/and-1.2.2-makefile.patch deleted file mode 100644 index d8af644..0000000 --- a/and-1.2.2-makefile.patch +++ /dev/null @@ -1,196 +0,0 @@ ---- and-1.2.2/Makefile.org 2005-03-27 21:39:37.000000000 +0200 -+++ and-1.2.2/Makefile 2007-07-25 18:25:00.000000000 +0200 -@@ -143,16 +143,16 @@ endif - # Build the auto-nice daemon. - # - and: and.o and-$(ARCH).o -- $(LD) and.o and-$(ARCH).o -o and $(LIBS) -+ $(LD) $(CFLAGS) -g and.o and-$(ARCH).o -o and $(LIBS) - - - # - # Independent part: configuration management, priority database. - # - and.o: and.c and.h -- $(CC) -DDEFAULT_INTERVAL=60 -DDEFAULT_NICE=0 \ -- -DDEFAULT_CONFIG_FILE=\"$(INSTALL_ETC)/and.conf\" \ -- -DDEFAULT_DATABASE_FILE=\"$(INSTALL_ETC)/and.priorities\" \ -+ $(CC) $(CFLAGS) -g -DDEFAULT_INTERVAL=60 -DDEFAULT_NICE=0 \ -+ -DDEFAULT_CONFIG_FILE=\"$(INSTALL_ETC)/and/and.conf\" \ -+ -DDEFAULT_DATABASE_FILE=\"$(INSTALL_ETC)/and/and.priorities\" \ - -DAND_VERSION=\"$(VERSION)\" -DAND_DATE=\"$(DATE)\" -c and.c - - -@@ -160,7 +160,7 @@ and.o: and.c and.h - # Unix variant specific stuff - # - and-Linux.o: and.h and-Linux.c -- $(CC) -c and-Linux.c -+ $(CC) $(CFLAGS) -g -c and-Linux.c - - and-OpenBSD.o: and.h and-OpenBSD.c - $(CC) -c and-OpenBSD.c -@@ -214,30 +214,19 @@ and.priorities.5: and.priorities.5.man - # - # Install and under $(PREFIX)/bin etc. - # --install: and $(INITSCRIPT) -- strip and -+install: and -+ - #-mkdir $(PREFIX) - -mkdir -p $(DESTDIR)$(INSTALL_SBIN) -- -mkdir -p $(DESTDIR)$(INSTALL_ETC) -+ -mkdir -p $(DESTDIR)$(INSTALL_ETC)/and/ - -mkdir -p $(DESTDIR)$(INSTALL_INITD) - -mkdir -p $(DESTDIR)$(INSTALL_MAN)/man5 - -mkdir -p $(DESTDIR)$(INSTALL_MAN)/man8 - $(INSTALL) -m 0755 and $(DESTDIR)$(INSTALL_SBIN) -- test -e $(DESTDIR)$(INSTALL_ETC)/and.conf || \ -- $(INSTALL) -m 0644 and.conf $(DESTDIR)$(INSTALL_ETC) -- test -e $(DESTDIR)$(INSTALL_ETC)/and.priorities || \ -- $(INSTALL) -m 0644 and.priorities $(DESTDIR)$(INSTALL_ETC) --ifneq (${INITSCRIPT},) --ifneq (${INSTALL_INITD},) -- @echo "Installing SysV script in $(DESTDIR)$(INSTALL_INITD)" -- $(INSTALL) -m 0755 $(INITSCRIPT) $(DESTDIR)$(INSTALL_INITD)/and --else -- @echo "Installing SysV script in $(DESTDIR)$(INSTALL_SBIN)" -- $(INSTALL) -m 0755 $(INITSCRIPT) $(DESTDIR)$(INSTALL_SBIN) -- @echo "Installing SysV init.d finder in $(DESTDIR)$(INSTALL_SBIN)" -- $(INSTALL) -m 0755 and-find-init.d $(DESTDIR)$(INSTALL_SBIN) --endif --endif -+ test -e $(DESTDIR)$(INSTALL_ETC)/and/and.conf || \ -+ $(INSTALL) -m 0644 and.conf $(DESTDIR)$(INSTALL_ETC)/and/ -+ test -e $(DESTDIR)$(INSTALL_ETC)/and/and.priorities || \ -+ $(INSTALL) -m 0644 and.priorities $(DESTDIR)$(INSTALL_ETC)/and/ - $(INSTALL) -m 0644 and.8 $(DESTDIR)$(INSTALL_MAN)/man8 - $(INSTALL) -m 0644 and.conf.5 $(DESTDIR)$(INSTALL_MAN)/man5 - $(INSTALL) -m 0644 and.priorities.5 $(DESTDIR)$(INSTALL_MAN)/man5 -@@ -252,9 +241,6 @@ simpleinstall: and and.init - cp and.conf $(DESTDIR)$(INSTALL_ETC) - test -e $(DESTDIR)$(INSTALL_ETC)/and.priorities || \ - cp and.priorities $(DESTDIR)$(INSTALL_ETC) --ifneq (${INITSCRIPT},) # on SysV only -- cp $(INITSCRIPT) $(DESTDIR)$(INSTALL_INITD)/and --endif - cp and.8 $(DESTDIR)$(INSTALL_MAN)/man8 - cp and.conf.5 $(DESTDIR)$(INSTALL_MAN)/man5 - cp and.priorities.5 $(DESTDIR)$(INSTALL_MAN)/man5 ---- and-1.2.2/and.priorities.5.man.org 2004-04-05 21:19:29.000000000 +0200 -+++ and-1.2.2/and.priorities.5.man 2007-07-25 18:25:00.000000000 +0200 -@@ -1,7 +1,7 @@ - .TH AND.PRIORITIES 5 "__DATE__" "Unix" "File Formats" - - .SH "NAME" --/etc/and.priorities \- priority database for the auto nice daemon. -+/etc/and/and.priorities \- priority database for the auto nice daemon. - - - .SH "VERSION" -@@ -16,12 +16,12 @@ This is the priority database file for - It stores (user, group, command, parent, nicelevels) tuples (hereafter called - entries) to determine the new nice level (or the kill signal, for that - matter) when a job reaches one of the time limits defined in --.I /etc/and.conf. -+.I /etc/and/and.conf. - (See lv1time, lv2time, and lv3time on the and.conf manual page for - details.) See the - .B affinity - setting in --.I /etc/and.conf -+.I /etc/and/and.conf - for how ambiguities between the fields (user, group, command, parent) - are dealt with when searching the database to determine the new nice - level for a job. -@@ -187,7 +187,7 @@ grid * grid_master * 0 0 0 - .SH "FILES" - - .TP 0.5i --.B /etc/and.priorities -+.B /etc/and/and.priorities - The priority database (in plain text). Contains the (user, group, command, - nicelevels) tuples. This is what this manual page is about. - ---- and-1.2.2/and.conf.5.man.org 2005-03-27 21:38:32.000000000 +0200 -+++ and-1.2.2/and.conf.5.man 2007-07-25 18:25:00.000000000 +0200 -@@ -1,7 +1,7 @@ - .TH AND.CONF 5 "__DATE__" "Unix" "File Formats" - - .SH "NAME" --/etc/and.conf \- general configuration parameters for the -+/etc/and/and.conf \- general configuration parameters for the - auto nice daemon. - - -@@ -52,11 +52,11 @@ the auto nice daemon to enable the chang - .B defaultnice - The default nice level. A number between 0 and 19. Jobs for which no - entry can be found in --.I /etc/and.priorities -+.I /etc/and/and.priorities - are reniced to this level, regardless of the CPU time they've used - so far. If you prefer to renice unknown jobs gradually, you can do - so by supplying three asterisks as (user, group, command) tuple in --.I /etc/and.priorities. -+.I /etc/and/and.priorities. - The default nice level is - .I 0 - ---- and-1.2.2/and.8.man.org 2002-01-27 16:59:57.000000000 +0100 -+++ and-1.2.2/and.8.man 2007-07-25 18:25:00.000000000 +0200 -@@ -55,13 +55,13 @@ to kill -9 it after e.g. 20 CPU minutes. - .TP 0.5i - .B \-c /path/to/and.conf - Specifies the configuration file. If this flag is omitted, --.I /etc/and.conf -+.I /etc/and/and.conf - is used instead. - - .TP 0.5i - .B \-d /path/to/and.priorities - Specifies the priority database file. If this flag is omitted, --.I /etc/and.priorities -+.I /etc/and/and.priorities - is used instead. - - .TP 0.5i -@@ -112,12 +112,12 @@ database. - .SH "FILES" - - .TP 0.5i --.B /etc/and.conf -+.B /etc/and/and.conf - General configuration file. Stores default nice level, default interval, - the "time zones" and the database lookup affinity. - - .TP 0.5i --.B /etc/and.priorities -+.B /etc/and/and.priorities - The priority database (in plain text). Contains the (user, group, command, - nicelevels) tuples. - ---- and-1.2.2/README.org 2005-03-27 21:39:37.000000000 +0200 -+++ and-1.2.2/README 2007-07-25 18:28:31.000000000 +0200 -@@ -83,13 +83,13 @@ Installation: - - Edit the Makefile, which is well documented. (g)make. (g)make install. - (make simpleinstall if you don't have install(1) (which you really -- should). Edit the configuration files, /etc/and.conf and -- /etc/and.priorities. Start /usr/local/sbin/and. You must run it as -- root if you want it to renice or kill any jobs but your own; on all -- platforms but Linux, not even dummy mode will work for mortal users. -- That's due to the way process information is accessible under these -- Unices. (Linux is more generous here, which can be seen as both an -- advantage and a security flaw. I'm not conclusive on this topic.) -+ should). Edit the configuration files, /etc/and/and.conf and -+ /etc/and/and.priorities. Start /usr/sbin/and. You must run it as root -+ if you want it to renice or kill any jobs but your own; on all platforms -+ but Linux, not even dummy mode will work for mortal users. That's due to -+ the way process information is accessible under these Unices. (Linux is -+ more generous here, which can be seen as both an advantage and a security -+ flaw. I'm not conclusive on this topic.) - - Last updated: - diff --git a/and.service b/and.service deleted file mode 100644 index 67a706d..0000000 --- a/and.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=auto nice daemon -After=syslog.target - -[Service] -Type=forking -EnvironmentFile=/etc/sysconfig/and -ExecStart=/usr/sbin/and $AND_FLAGS -StandardOutput=syslog -StandardError=syslog - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/and.spec b/and.spec deleted file mode 100644 index ebc7f26..0000000 --- a/and.spec +++ /dev/null @@ -1,161 +0,0 @@ -Name: and -Version: 1.2.2 -Release: 24%{?dist} -Summary: Auto nice daemon - -License: GPLv2 -Group: System Environment/Daemons - -URL: http://and.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: and.sysconf -Source2: and.service -Patch1: and-1.2.2-makefile.patch - -Obsoletes: and-sysvinit < %{version}-%{release} -Provides: and-sysvinit = %{version}-%{release} - -Obsoletes: and-units < %{version}-%{release} -Provides: and-units = %{version}-%{release} - -BuildRequires: systemd-units - -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - -provides: and-sysvinit = %{version}-%{release} -Obsoletes: and-sysvinit < 1.2.2-11 - -provides: and-units = %{version}-%{release} -Obsoletes: and-units < 1.2.2-11 - - -Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) - -%description -The auto nice daemon renices and even kills jobs according to their CPU time, -owner, and command name. This is especially useful on production machines with -lots of concurrent CPU-intensive jobs and users that tend to forget to -nice their jobs. - -%prep -%setup1 -q -%patch1 -p1 -b .org - -%build -make %{?_smp_mflags} \ - CFLAGS='%{optflags}' \ - PREFIX=%{_prefix} \ - INSTALL_ETC=%{_sysconfdir} \ - INSTALL_SBIN=%{_sbindir} \ - INSTALL_MAN=%{_mandir} - -%install -mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_mandir}/man8 -mkdir -p %{buildroot}%{_mandir}/man5 -make PREFIX=%{buildroot}%{_prefix} \ - INSTALL_ETC=%{buildroot}%{_sysconfdir} \ - INSTALL_SBIN=%{buildroot}%{_sbindir} \ - INSTALL_MAN=%{buildroot}%{_mandir} install - -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/and - -mkdir -p %{buildroot}%{_unitdir} -install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} - -%post -%systemd_post and.service - -%preun -%systemd_preun and.service - -%postun -%systemd_postun_with_restart and.service - -%files -%defattr(-,root,root) -%doc README LICENSE CHANGELOG -%config(noreplace) %{_sysconfdir}/and/ -%config(noreplace) %{_sysconfdir}/sysconfig/and -%{_sbindir}/* -%{_mandir}/man5/*.gz -%{_mandir}/man8/*.gz -%{_unitdir}/and.service - -%changelog -* Wed Feb 03 2016 Fedora Release Engineering - 1.2.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 1.2.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 1.2.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.2.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Oct 5 2012 Jochen Schmitt - 1.2.2-18 -- Introduction of rpm systemd macros -- Clean up of the SPEC file - -* Tue Aug 28 2012 Jochen Schmitt 1.2.2-17 -- Fix misprint operator in %%post stanza (#852419) - -* Fri Jul 27 2012 Fedora Release Engineering - 1.2.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.2.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 26 2011 Fedora Release Engineering - 1.2.2-14 -- Rebuilt for glibc bug#747377 - -* Wed Jun 15 2011 Jochen Schmitt 1.2.2-13 -- Rework and.service to fix #713432 - -* Thu Mar 31 2011 Jochen Schmitt 1.2.2-12 -- Rework for systemd - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Nov 28 2010 Jochen Schmitt 1.2.2-10 -- Remove SysVInit support - -* Sun Jul 18 2010 Jochen Schmitt 1.2.2-9 -- Try to add systemd support - -* Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 1.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 13 2008 Jochen Schmitt 1.2.2-6 -- Rebuild for gcc-4.3 - -* Wed Jan 23 2008 Jochen Schmitt 1.2.2-5 -- Rebuild - -* Thu Aug 9 2007 Jochen Schmitt 1.2.2-4 -- Changing license tag - -* Mon Jul 30 2007 Jochen Schmitt 1.2.2-3 -- Fix wrong postun requires - -* Thu Jul 26 2007 Jochen Schmitt 1.2.2-2 -- Adding sysconfig file template - -* Tue Jul 24 2007 Jochen Schmitt 1.2.2-1 -- Initial package for Fedora diff --git a/and.sysconf b/and.sysconf deleted file mode 100644 index 3daac21..0000000 --- a/and.sysconf +++ /dev/null @@ -1,4 +0,0 @@ -# Allow to set the options for and starting -# by the initscript - -AND_FLAGS= \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5322507 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-09-13: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index d61534a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b939909039a8487eec93ff7eb56a4779 and-1.2.2.tar.gz