commit d671c0e018cafe73ac1ec9211de042eed37c9d81
Author: Jan Rękorajski <[email protected]>
Date: Fri Apr 24 09:36:21 2020 +0200
- up to 2.12.0
- new upstream URL
amavisd-new-config.patch | 5 ++++-
amavisd-new.spec | 11 ++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 78007ae..b59a04e 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,24 +1,25 @@
# TODO:
+# - consider following upstream and renaming to amavis
# - Add polish info mail templates
# - move amavis part of tmpwatch configuration from tmpwatch.spec
#
Summary: A Mail Virus Scanner with SpamAssassin support - daemon
Summary(pl.UTF-8): Antywirusowy skaner poczty elektronicznej z obsługą
SpamAssasina - demon
Name: amavisd-new
-Version: 2.10.1
+Version: 2.12.0
Release: 1
Epoch: 1
License: GPL
Group: Applications/Mail
-Source0: http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.xz
-# Source0-md5: adb0c64ac6a91249ddeb4ed97747d755
+Source0:
https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2
+# Source0-md5: 67cdd043d5d7046ec5995564444ec10f
Source1: %{name}.init
Source2: %{name}.tmpfiles
Source3: %{name}.tmpwatch
Source4: %{name}.service
Patch0: %{name}-config.patch
Patch1: %{name}-tools-dbdir.patch
-URL: http://www.ijs.si/software/amavisd/
+URL: https://gitlab.com/amavis/amavis/
BuildRequires: rpm-perlprov
BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: tar >= 1:1.22
@@ -132,7 +133,7 @@ This package contains LDAP schema for use with amavisd-new.
Ten pakiet zawiera schemat LDAP do używania z amavisd-new.
%prep
-%setup -q
+%setup -q -n amavis-v%{version}
%patch0 -p1
%patch1 -p1
diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index b2ffb40..667308c 100644
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -1,6 +1,6 @@
--- amavisd-new-2.7.0/amavisd.conf~ 2011-07-01 19:21:01.000000000 +0300
+++ amavisd-new-2.7.0/amavisd.conf 2011-08-08 13:03:11.992905314 +0300
-@@ -10,29 +10,29 @@
+@@ -10,32 +10,32 @@
# COMMONLY ADJUSTED SETTINGS:
# @bypass_virus_checks_maps = (1); # controls running of anti-virus code
@@ -8,6 +8,9 @@
+@bypass_spam_checks_maps = (1); # controls running of anti-spam code
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
+ # $myprogram_name = $0; # set to 'amavisd' or similar to avoid process name
+ # truncation in /proc/<pid>/stat and ps -e output
+
$max_servers = 2; # num of pre-forked children (2..30 is common),
-m
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/amavisd-new.git/commitdiff/d671c0e018cafe73ac1ec9211de042eed37c9d81
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
