commit 848975062c84ef81f2678ad2a77c2f3ece0e19c6
Author: Adam Williamson <awilliam@xxxxxxxxxx>
Date: Fri May 10 10:05:57 2013 -0700
init_network.patch: don't source /etc/sysconfig/network in initscript
amavisd-new-2.8.0-init_network.patch | 13 +++++++++++++
amavisd-new.spec | 11 ++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/amavisd-new-2.8.0-init_network.patch b/amavisd-new-2.8.0-init_network.patch
new file mode 100644
index 0000000..8018e2c
--- /dev/null
+++ b/amavisd-new-2.8.0-init_network.patch
@@ -0,0 +1,13 @@
+--- amavisd-new-2.8.0/amavisd_init.sh 2002-11-15 20:22:47.000000000 -0800
++++ amavisd-new-2.8.0/amavisd_init.sh.new 2013-05-10 09:54:58.849116467 -0700
+@@ -12,8 +12,8 @@
+ # Source function library.
+ . /etc/rc.d/init.d/functions
+
+-# Source networking configuration.
+-. /etc/sysconfig/network
++## Source networking configuration.
++#. /etc/sysconfig/network
+
+ #prog="/opt/amavisd-new/sbin/amavisd"
+ prog="/usr/sbin/amavisd"
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 512d1e3..c84804b 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.8.0
-Release: 4%{?prerelease:.%{prerelease}}%{?dist}
+Release: 5%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -20,6 +20,11 @@ Source8: amavisd-new-tmpfiles.conf
Patch0: amavisd-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
+# Don't source /etc/sysconfig/network in init script; the network check
+# is commented out upstream so there's no apparent reason to source it,
+# and it can't be relied upon to exist in recent Fedora builds. Mail
+# sent upstream to amavis-users ML 2013-05-10. -adamw
+Patch3: amavisd-new-2.8.0-init_network.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: /usr/sbin/clamd, /etc/clamd.d
Requires: /usr/sbin/tmpwatch, /etc/cron.daily
@@ -114,6 +119,7 @@ alerting purposes.
%patch0 -p1
%patch1 -p1
%patch2 -p0
+%patch3 -p1
install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -221,6 +227,9 @@ fi
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Fri May 10 2013 Adam Williamson <awilliam@xxxxxxxxxx> - 2.8.0-5
+- init_network.patch: don't source /etc/sysconfig/network in initscript
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
