From 112ed52fe5e8a20a2e9ff551f5c82fd4124123b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 10 Oct 2019 17:05:50 +0200 Subject: [PATCH] Dropped sysvinit artifacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It wasn't installed for some time. Signed-off-by: Jaroslav Škarvada --- exim.init | 132 ------------------------------------------------------ exim.spec | 11 ++--- 2 files changed, 4 insertions(+), 139 deletions(-) delete mode 100644 exim.init diff --git a/exim.init b/exim.init deleted file mode 100644 index 275fae2..0000000 --- a/exim.init +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash -# -# exim This shell script takes care of starting and stopping exim -# -# chkconfig: 2345 80 30 -# description: Exim is a Mail Transport Agent, which is the program \ -# that moves mail from one machine to another. -# processname: exim -# config: /etc/exim/exim.conf -# pidfile: /var/run/exim.pid - -# Source function library. -. /etc/init.d/functions - -# Source networking configuration. -[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network - -# Source exim configureation. -if [ -f /etc/sysconfig/exim ] ; then - . /etc/sysconfig/exim -else - DAEMON=yes - QUEUE=1h -fi - -USER=${USER:=exim} -GROUP=${GROUP:=exim} - -gen_cert() { - if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then - umask 077 - FQDN=`hostname` - if [ "x${FQDN}" = "x" ]; then - FQDN=localhost.localdomain - fi - echo -n $"Generating exim certificate: " - cat << EOF | openssl req -new -x509 -days 365 -nodes \ - -out /etc/pki/tls/certs/exim.pem \ - -keyout /etc/pki/tls/private/exim.pem &>/dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -${FQDN} -root@${FQDN} -EOF - if [ $? -eq 0 ]; then - success - chown $USER:$GROUP /etc/pki/tls/{private,certs}/exim.pem - chmod 600 /etc/pki/tls/{private,certs}/exim.pem - else - failure - fi - echo - fi -} - -start() { - [ "$EUID" != "0" ] && exit 4 - [ "${NETWORKING}" = "no" ] && exit 1 - [ -f /usr/sbin/exim ] || exit 5 - - # check ownerships - # do this by seeing if /var/log/exim/main.log exists and is - # owned by exim - if owned by someone else we fix it up - if [ -f /var/log/exim/main.log ] - then - if [ "exim" != "`ls -l /var/log/exim/main.log | awk '{print $4}'`" ] - then - chown -R $USER:$GROUP /var/log/exim /var/spool/exim - fi - fi - - # generate certificate if doesn't exist - gen_cert - - # Start daemons. - echo -n $"Starting exim: " - daemon /usr/sbin/exim $([ "$DAEMON" = yes ] && echo -bd) \ - $([ -n "$QUEUE" ] && echo -q$QUEUE) - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch /var/lock/subsys/exim -} - -stop() { - [ "$EUID" != "0" ] && exit 4 - # Stop daemons. - echo -n $"Shutting down exim: " - killproc exim - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f /var/lock/subsys/exim -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - reload|force-reload) - status exim > /dev/null || exit 7 - echo -n $"Reloading exim:" - killproc exim -HUP - echo - ;; - condrestart|try-restart) - status exim > /dev/null || exit 0 - restart - ;; - status) - status exim - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|force-reload|status|condrestart|try-restart}" - exit 2 -esac - -exit $RETVAL - diff --git a/exim.spec b/exim.spec index e502ba9..06fb620 100644 --- a/exim.spec +++ b/exim.spec @@ -12,7 +12,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.92.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: http://www.exim.org/ @@ -25,7 +25,6 @@ Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd BuildRequires: clamav-devel %endif Source: ftp://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.xz -Source2: exim.init Source3: exim.sysconfig Source4: exim.logrotate Source5: exim-tidydb.sh @@ -256,11 +255,6 @@ pod2man --center=EXIM --section=8 \ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/exim -%if 0%{?fedora} < 23 -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install %SOURCE2 $RPM_BUILD_ROOT%{_initrddir}/exim -%endif - # Systemd mkdir -p %{buildroot}%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir} @@ -491,6 +485,9 @@ fi %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Thu Oct 10 2019 Jaroslav Škarvada - 4.92.3-2 +- Dropped sysvinit artifacts + * Mon Sep 30 2019 Jaroslav Škarvada - 4.92.3-1 - New version Resolves: rhbz#1756656