commit amavisd-new for openSUSE:Factory

2020-11-05 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2020-11-05 21:55:49

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new.11331 (New)


Package is "amavisd-new"

Thu Nov  5 21:55:49 2020 rev:71 rq:846217 version:2.12.0

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2020-02-03 
11:16:06.113929347 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new.11331/amavisd-new.changes   
2020-11-05 21:56:31.395967888 +0100
@@ -1,0 +2,28 @@
+Mon Oct 26 21:43:51 UTC 2020 - Arjen de Korte 
+
+- update to version 2.12.0
+  * Upstream changed to GitLab
+  * Introduce Rspamd client extension
+With this extension, Amavis can use Rspamd either running on the same
+server or remotely. Connections are made using HTTP/HTTPS depending on
+configuration, the latter requiring a HTTPS-capable proxy (like NGINX or
+Apache) for Rspamd, which does not natively support HTTPS. Basic
+authentication with name/password pairs is also available.
+  * Treat "not an OLE file" as a successful result
+Amavis supports calling the ripOLE program to extract embedded objects
+from Microsoft OLE documents. However, not all Microsoft documents
+contain said objects, and the underlying file format changes when they
+do. Since Amavis can't tell the difference, it passes everything to
+ripOLE unconditionally.  Amavis now treats the "not an OLE file" error
+code of ripOLE as a successful result, proceeds normally and scans the
+file as a whole.
+  * Fix unix socket path extraction that has prevented a socket based
+policy bank to be loaded;
+  * Fix DKIM signing for outbound messages (remove dkim-signing.diff)
+  * Fix unescaped left brace regex warning in run_av() subroutine.
+  * Mention default value for $myprogram_name in minimal amavisd.conf.
+- cleanup spec
+  * remove unused rc.amavis SysV initscript
+  * remove unused /usr/lib/tmpfiles.d
+
+---

Old:

  amavisd-new-2.11.1.tar.bz2
  dkim-signing.diff
  rc.amavis

New:

  amavis-v2.12.0.tar.bz2



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.f0IQ7k/_old  2020-11-05 21:56:32.175966134 +0100
+++ /var/tmp/diff_new_pack.f0IQ7k/_new  2020-11-05 21:56:32.175966134 +0100
@@ -16,28 +16,21 @@
 #
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
-%endif
-%define _buildshell /bin/bash
-
-%define avspool/var/spool/amavis
-%define avdb   /var/spool/amavis/db
-%define avquarantine   /var/spool/amavis/virusmails
+%define avspool%{_localstatedir}/spool/amavis
+%define avdb   %{_localstatedir}/spool/amavis/db
+%define avquarantine   %{_localstatedir}/spool/amavis/virusmails
 %define logmsg logger -t %{name}/rpm
 %define avuser vscan
 %define avgroupvscan
 Name:   amavisd-new
-Version:2.11.1
+Version:2.12.0
 Release:0
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0-or-later
 Group:  Productivity/Networking/Security
-URL:https://amavis.org/
-Source0:https://amavis.org/%{name}-%{version}.tar.bz2
+URL:https://gitlab.com/amavis/amavis/
+Source0:
https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2
 Source1:sysconfig.amavis
-Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
 Source4:amavisd-milter-1.6.1.tar.gz
 Source5:amavis.service
@@ -45,11 +38,10 @@
 Patch1: activate_virus_scanner.diff
 # PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn()
 Patch2: amavisd-new-2.10.1-myhostname.patch
-# PATCH-FIX-UPSTREAM -- originating was not recognized for DKIM signing
-Patch3: dkim-signing.diff
 BuildRequires:  sed
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
 Requires:   bzip2
 Requires:   file
@@ -57,10 +49,8 @@
 Requires:   perl-Archive-Tar
 Requires:   perl-Archive-Zip
 Requires:   perl-BerkeleyDB
-Requires:   perl-Compress-Zlib
 Requires:   perl-Convert-BinHex
 Requires:   perl-Convert-TNEF
-Requires:   perl-Convert-UUlib
 Requires:   perl-IO-stringy
 Requires:   perl-MIME-tools
 Requires:   perl-Mail-DKIM
@@ -73,26 +63,25 @@
 Requires:   smtp_daemon
 Requires:   spamassassin
 Requires:   zoo
-Recommends: unar
-Recommends: clamav perl-spamassassin
-Recommends: perl-DBI
-Recommends: 

commit amavisd-new for openSUSE:Factory

2020-02-03 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2020-02-03 11:15:40

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new.26092 (New)


Package is "amavisd-new"

Mon Feb  3 11:15:40 2020 rev:70 rq:769384 version:2.11.1

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2019-04-01 
12:40:00.181962326 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new.26092/amavisd-new.changes   
2020-02-03 11:16:06.113929347 +0100
@@ -1,0 +2,5 @@
+Sun Feb  2 08:19:17 UTC 2020 - Thorsten Kukuk 
+
+- pwdutils is gone since ages
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.DwBjJM/_old  2020-02-03 11:16:07.817930208 +0100
+++ /var/tmp/diff_new_pack.DwBjJM/_new  2020-02-03 11:16:07.821930210 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0-or-later
 Group:  Productivity/Networking/Security
-Url:https://amavis.org/
+URL:https://amavis.org/
 Source0:https://amavis.org/%{name}-%{version}.tar.bz2
 Source1:sysconfig.amavis
 Source2:rc.amavis
@@ -84,7 +84,7 @@
 Recommends: %{name}-docs = %{version}
 Requires(pre):  util-linux-systemd
 Requires(post): util-linux-systemd
-Requires(pre):  pwdutils
+Requires(pre):  shadow
 Requires(post): %fillup_prereq
 Requires(post): grep
 OrderWithRequires(post): /usr/bin/newaliases




commit amavisd-new for openSUSE:Factory

2019-04-01 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2019-04-01 12:39:59

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new.25356 (New)


Package is "amavisd-new"

Mon Apr  1 12:39:59 2019 rev:69 rq:690199 version:2.11.1

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2018-10-23 
20:37:18.136765667 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new.25356/amavisd-new.changes   
2019-04-01 12:40:00.181962326 +0200
@@ -1,0 +2,9 @@
+Sun Mar 17 20:55:56 UTC 2019 - Jan Engelhardt 
+
+- Mark build recipe as bash-specific.
+- Do not hide errors from useradd.
+- Remove pre-openSUSE-12.3 logic.
+- Convert PreReq and rebuild Requires(pre/post) lists.
+- Remove hard scriptlet dependency on systemd.
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.fi5hZe/_old  2019-04-01 12:40:00.985962716 +0200
+++ /var/tmp/diff_new_pack.fi5hZe/_new  2019-04-01 12:40:00.985962716 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
 %endif
+%define _buildshell /bin/bash
 
 %define avspool/var/spool/amavis
 %define avdb   /var/spool/amavis/db
@@ -72,20 +73,6 @@
 Requires:   smtp_daemon
 Requires:   spamassassin
 Requires:   zoo
-PreReq: coreutils
-PreReq: net-tools
-PreReq: pwdutils
-%if 0%{?suse_version} < 1230
-PreReq: %insserv_prereq
-%endif
-PreReq: util-linux
-%if 0%{?suse_version} < 1120
-Requires:   lha
-%endif
-%if 0%{?suse_version} > 1140
-BuildRequires:  systemd
-%{?systemd_requires}
-%endif
 Recommends: unar
 Recommends: clamav perl-spamassassin
 Recommends: perl-DBI
@@ -95,10 +82,14 @@
 Recommends: p7zip
 Recommends: binutils
 Recommends: %{name}-docs = %{version}
-%if 0%{?suse_version} > 1310
 Requires(pre):  util-linux-systemd
 Requires(post): util-linux-systemd
-%endif
+Requires(pre):  pwdutils
+Requires(post): %fillup_prereq
+Requires(post): grep
+OrderWithRequires(post): /usr/bin/newaliases
+BuildRequires:  systemd-rpm-macros
+%{?systemd_ordering}
 Provides:   amavisd-milter = 1.6.0
 Obsoletes:  amavisd-milter <= 1.5.0
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -149,7 +140,6 @@
 
 %build
 cd amavisd-milter*
-export CFLAGS="%{optflags}"
 %configure --localstatedir="%{avspool}"
 make %{?_smp_mflags}
 
@@ -173,49 +163,31 @@
 install -m 644 amavisd.conf %{buildroot}/etc/amavisd.conf
 install -m 644 LDAP.schema %{buildroot}/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm %{buildroot}/%{perl_vendorlib}/JpegTester.pm
-%if 0%{?suse_version} > 1140
 mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{S:5} %{buildroot}%{_unitdir}
-%endif
-%if 0%{?suse_version} < 1230
-mkdir -p %{buildroot}/etc/init.d
-install -m 755 %{S:2} %{buildroot}/etc/init.d/amavis
-ln -s ../../etc/init.d/amavis %{buildroot}/%{_sbindir}/rcamavis
-%else
 ln -s service %{buildroot}/%{_sbindir}/rcamavis
-%endif
 install -m 755 %{S:6} %{buildroot}%{_sbindir}/
 cd amavisd-milter*
-make install DESTDIR="%{buildroot}"
+%make_install
 
 %pre
-%{_sbindir}/groupadd -r %{avgroup} 2> /dev/null || :
+getent group %{avgroup} >/dev/null || \
+   %{_sbindir}/groupadd -r %{avgroup}
 %{logmsg} "Added group %{avgroup} for package %{name}"
-%{_sbindir}/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" 
-d %{avspool} %{avuser} 2> /dev/null || :
+getent passwd %{avuser} >/dev/null || \
+   %{_sbindir}/useradd -r -o -g %{avgroup} -u 65 -s /bin/false \
+   -c "Vscan account" -d %{avspool} %{avuser}
 %{_sbindir}/usermod %{avuser} -g %{avgroup} 2> /dev/null || :
 %{logmsg} "Added user %{avuser} for package %{name}"
-%if 0%{?suse_version} > 1140
 %service_add_pre amavis.service
-%endif
 
 %preun
-%if 0%{?suse_version} < 1230
-%stop_on_removal amavis
-%endif
-%if 0%{?suse_version} > 1140
 %service_del_preun amavis.service
-%endif
 exit 0
 
 %post
-%if 0%{?suse_version} < 1230
-%{fillup_and_insserv -n amavis amavis}
-%else
 %{fillup_only -n amavis}
-%endif
-%if 0%{?suse_version} > 1140
 %service_add_post amavis.service
-%endif
 # Update ?
 if [ ${1:-0} -gt 1 ]; then
  : OK currently nothing to do
@@ -234,13 +206,7 @@
 fi
 
 %postun
-%if 0%{?suse_version} < 1230
-%res

commit amavisd-new for openSUSE:Factory

2018-10-23 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2018-10-23 20:37:13

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Tue Oct 23 20:37:13 2018 rev:68 rq:643554 version:2.11.1

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2018-03-18 
21:44:45.693893286 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2018-10-23 20:37:18.136765667 +0200
@@ -1,0 +2,23 @@
+Sun Oct 14 06:59:01 UTC 2018 - w...@rosenauer.org
+
+- update to version 2.11.1
+  * removed a trailing dot element from @INC, as a workaround for a perl
+vulnerability CVE-2016-1238
+  * amavis-services: bumping up syslog level from LOG_NOTICE to LOG_ERR
+for a message "PID  went away", and removed redundant newlines
+from some log messages
+  * safe_decode() and safe_decode_utf8(): avoid warning messages
+"Use of uninitialized value in subroutine entry"
+in Encode::MIME::Header when the $check argument is undefined
+  * @sa_userconf_maps has been extended to allow loading of per-recipient
+(or per-policy bank, or global) SpamAssassin configuration set from
+LDAP. For consistency with SQL a @sa_userconf_maps entry prefixed with
+'ldap:' will load SpamAssassin configuration set using the
+load_scoreonly_ldap() method;  a patch by Atanas Karashenski
+  * add some Sanesecurity.Foxhole false positives to the default
+list @virus_name_to_spam_score_maps
+  * updated some comments
+- update amavis-milter to version 2.6.1
+  * Fixed bug when creating amavisd-new policy bank names
+
+---
@@ -11 +34 @@
-  amavisd-new should require spamassassine
+  amavisd-new should require spamassassin

Old:

  amavisd-milter-1.6.0.tar.gz
  amavisd-new-2.11.0.tar.xz

New:

  amavisd-milter-1.6.1.tar.gz
  amavisd-new-2.11.1.tar.bz2



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.LZzi8L/_old  2018-10-23 20:37:20.684762623 +0200
+++ /var/tmp/diff_new_pack.LZzi8L/_new  2018-10-23 20:37:20.688762618 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -28,17 +28,17 @@
 %define avuser vscan
 %define avgroupvscan
 Name:   amavisd-new
-Version:2.11.0
+Version:2.11.1
 Release:0
 Summary:High-Performance E-Mail Virus Scanner
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Productivity/Networking/Security
-Url:http://www.ijs.si/software/amavisd/
-Source0:http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.xz
+Url:https://amavis.org/
+Source0:https://amavis.org/%{name}-%{version}.tar.bz2
 Source1:sysconfig.amavis
 Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
-Source4:amavisd-milter-1.6.0.tar.gz
+Source4:amavisd-milter-1.6.1.tar.gz
 Source5:amavis.service
 Source6:amavisd-milter.sh
 Patch1: activate_virus_scanner.diff

++ amavisd-milter-1.6.0.tar.gz -> amavisd-milter-1.6.1.tar.gz ++
 7264 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/amavisd-milter-1.6.0/CHANGES new/amavisd-milter-1.6.1/CHANGES
--- old/amavisd-milter-1.6.0/CHANGES2013-05-19 23:07:26.0 +0200
+++ new/amavisd-milter-1.6.1/CHANGES2015-05-24 22:50:39.0 +0200
@@ -1,10 +1,21 @@
 This is the CHANGELOG for amavisd-milter.
 
+20150524:
+   amavisd-milter-1.6.1:
+
+   Bug and compatibility fixies:
+   - Fixed bug when creating amavisd-new policy bank names.
+
+20150524:
+   Fixed bug when creating amavisd-new policy bank names.
+
+   Thanks to: Christian Roessner 
+
 20130519:
amavisd-milter-1.6.0:
 
New features:
-   - Added new amavisd-milter option -B which pases value of
+   - Added new amavisd-milter option -B which passes value of
  {daemon_name} milter macro as amavisd-new policy bank name.
 
Bug and compatibility fixies:
@@ -16,7 +27,7 @@
Added new amavisd-milter option -B which uses value of {

commit amavisd-new for openSUSE:Factory

2018-03-18 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2018-03-18 21:44:45

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Sun Mar 18 21:44:45 2018 rev:67 rq:587816 version:2.11.0

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2018-01-22 
16:20:55.215193675 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2018-03-18 21:44:45.693893286 +0100
@@ -1,0 +2,12 @@
+Thu Mar 15 13:59:13 UTC 2018 - vark...@suse.com
+
+- bsc#1072122 amavisd-new should use unar instead of unrar
+
+---
+Wed Mar 14 09:15:49 UTC 2018 - vark...@suse.com
+
+- bsc#1071932 - YaST2 Mail Server Configuration - throws Error for
+  starting service amavis. 
+  amavisd-new should require spamassassine
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.mD9xSe/_old  2018-03-18 21:44:46.405867637 +0100
+++ /var/tmp/diff_new_pack.mD9xSe/_new  2018-03-18 21:44:46.409867493 +0100
@@ -70,6 +70,7 @@
 Requires:   perl-spamassassin
 Requires:   sharutils
 Requires:   smtp_daemon
+Requires:   spamassassin
 Requires:   zoo
 PreReq: coreutils
 PreReq: net-tools
@@ -85,7 +86,7 @@
 BuildRequires:  systemd
 %{?systemd_requires}
 %endif
-Recommends: unrar
+Recommends: unar
 Recommends: clamav perl-spamassassin
 Recommends: perl-DBI
 Recommends: perl-ldap




commit amavisd-new for openSUSE:Factory

2018-01-22 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2018-01-22 16:19:54

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Mon Jan 22 16:19:54 2018 rev:66 rq:567978 version:2.11.0

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2017-11-25 
08:43:05.597308328 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2018-01-22 16:20:55.215193675 +0100
@@ -1,0 +2,6 @@
+Sun Jan 14 14:56:08 UTC 2018 - vark...@suse.com
+
+- bnc#1007149 Amavisd-milter fails to start when started via systemd
+  Use fillup_only with -n amavis
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.uqjgwc/_old  2018-01-22 16:20:55.895161872 +0100
+++ /var/tmp/diff_new_pack.uqjgwc/_new  2018-01-22 16:20:55.899161684 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -210,7 +210,7 @@
 %if 0%{?suse_version} < 1230
 %{fillup_and_insserv -n amavis amavis}
 %else
-%fillup_only
+%{fillup_only -n amavis}
 %endif
 %if 0%{?suse_version} > 1140
 %service_add_post amavis.service




commit amavisd-new for openSUSE:Factory

2017-11-24 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2017-11-25 08:43:05

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Sat Nov 25 08:43:05 2017 rev:65 rq:545101 version:2.11.0

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2017-02-25 
00:53:48.466176437 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2017-11-25 08:43:05.597308328 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:42:57 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.jNn1Bp/_old  2017-11-25 08:43:06.473276412 +0100
+++ /var/tmp/diff_new_pack.jNn1Bp/_new  2017-11-25 08:43:06.477276266 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define avspool/var/spool/amavis
 %define avdb   /var/spool/amavis/db
 %define avquarantine   /var/spool/amavis/virusmails
@@ -154,11 +159,11 @@
 mkdir -p %{buildroot}%{avspool}/{tmp,var}
 mkdir -p %{buildroot}%{avdb}
 mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}/var/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}/etc/openldap/schema
 mkdir -p %{buildroot}%{perl_vendorlib}
 mkdir -p %{buildroot}/usr/lib/tmpfiles.d
-install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis 
%{buildroot}/var/adm/fillup-templates
+install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis %{buildroot}%{_fillupdir}
 install -m 755 amavisd %{buildroot}/%{_sbindir}/amavisd
 install -m 755 amavisd-agent %{buildroot}/%{_sbindir}/amavisd-agent
 install -m 755 amavisd-nanny %{buildroot}/%{_sbindir}/amavisd-nanny
@@ -248,7 +253,7 @@
 %endif
 %config(noreplace) /etc/amavisd.conf
 %config(noreplace) /etc/openldap/schema/amavisd-new.schema
-/var/adm/fillup-templates/sysconfig.amavis
+%{_fillupdir}/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
 %if 0%{?suse_version} > 1140




commit amavisd-new for openSUSE:Factory

2017-02-24 Thread root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2017-02-25 00:53:47

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2016-05-30 
09:56:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2017-02-25 00:53:48.466176437 +0100
@@ -1,0 +2,12 @@
+Wed Feb 22 22:25:51 UTC 2017 - w...@rosenauer.org
+
+- fixed DKIM signing by recognizing ORIGINATING
+  (regression in 2.11.0) (dkim-signing.diff)
+  (https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html)
+
+---
+Mon Feb 20 15:14:45 CET 2017 - ku...@suse.de
+
+- Don't require insserv if we don't need it.
+
+---

New:

  dkim-signing.diff



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.dQlKWn/_old  2017-02-25 00:53:49.617999706 +0100
+++ /var/tmp/diff_new_pack.dQlKWn/_new  2017-02-25 00:53:49.617999706 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,8 @@
 Patch1: activate_virus_scanner.diff
 # PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn()
 Patch2: amavisd-new-2.10.1-myhostname.patch
+# PATCH-FIX-UPSTREAM -- originating was not recognized for DKIM signing
+Patch3: dkim-signing.diff
 BuildRequires:  sed
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
@@ -67,7 +69,9 @@
 PreReq: coreutils
 PreReq: net-tools
 PreReq: pwdutils
+%if 0%{?suse_version} < 1230
 PreReq: %insserv_prereq
+%endif
 PreReq: util-linux
 %if 0%{?suse_version} < 1120
 Requires:   lha
@@ -120,6 +124,7 @@
 %setup -q -a 4
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *patch ]] ; then continue; fi
@@ -171,7 +176,7 @@
 install -m 755 %{S:2} %{buildroot}/etc/init.d/amavis
 ln -s ../../etc/init.d/amavis %{buildroot}/%{_sbindir}/rcamavis
 %else
-ln -s ../../sbin/service %{buildroot}/%{_sbindir}/rcamavis
+ln -s service %{buildroot}/%{_sbindir}/rcamavis
 %endif
 install -m 755 %{S:6} %{buildroot}%{_sbindir}/
 cd amavisd-milter*

++ dkim-signing.diff ++
diff --git a/amavisd b/amavisd
index 7f93194..3ff4028 100755
--- a/amavisd
+++ b/amavisd
@@ -34338,6 +34338,7 @@ sub collect_some_dkim_info($) {
 $sig_ind++;
   }
   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
+  $msginfo->originating(c('originating'));
   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
 # if (ll(5) && $sig_ind > 0) {
 #   # show which header fields are covered by which signature



commit amavisd-new for openSUSE:Factory

2016-05-30 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2016-05-30 09:56:37

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2016-01-23 
01:17:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2016-05-30 09:56:47.0 +0200
@@ -1,0 +2,73 @@
+Fri May 27 10:59:00 UTC 2016 - jcnen...@gmail.com
+
+- Update to version 2.11.0
+  + Bugfixes
+   * delivery method was undefined when always_bcc was used;
+ reported by Marieke Janssen;
+   * avoid warnings issued by perl 5.21.7 and later:
+ Negative repeat count does nothing at ./amavisd line 16408
+ and similarly in amavisd-status;
+   * releasing from an SQL quarantine failed to provide the original
+ envelope sender address to a released message;
+ reported, and a fix suggested by Tom Johnson and Tobias;
+   * remove a stale database file __db.nanny.db on a reload or restart,
+ as it can prevent a successful start when a previous start failed
+ for some reason; a patch by Trent Lloyd;
+  + Compatibility
+   * During startup more detailed testing is performed for taint bugs of
+ a module Encode and the function utf8::is_utf8(), which may produce
+ warnings on old versions of perl with its old core module Encode,
+ or may exit on detecting more sinister bugs in these modules.
+ Note that the module Encode may be upgraded independently of perl,
+ if desired;
+   * with MySQL: changed character set 'utf8' to 'utf8mb4' for fields
+ msgs.subject and msgs.from_addr, as previously some of the UTF-8
+ characters could not be stored in a database;
+   * when logging to stderr a timestamp prefix to each message is only
+ still inserted if $DEBUG is true.  When $DEBUG is false each message
+ is prefixed with a syslog log level in angle brackets, and a timestamp
+ is omitted (for compatibility with systemd);
+   * a perl module Digest::SHA is now a required module. It is a perl core
+ module since perl 5.10, so it shouldn't introduce a new dependency,
+ and it was a de-facto required module even previously, as it was 
needed
+ for DKIM processing;
+  + New features
+   * Polished rough corners to facilitate running amavisd as a 
non-daemonized
+ supervised process
+* A log template macro 'report_json' can now take arguments, which can
+ include or exclude fields (key/values) from the JSON report object.
+ Arguments to a macro are either field names (keys) to be included
+ in a report, or are field names to be excluded, each prefixed with
+ an exclamation mark, to produce a report with all but excluded fields.
+* Two new configuration settings are added: %smtpd_tls_server_options
+ and %smtp_tls_client_options. These two associative arrays are passed
+ to IO::Socket::SSL->start_SSL when establishing a server-side or a
+ client-side TLS session with an MTA, and provide more control over
+ a TLS session - like providing certificates and restricting ciphers.
+ See documentation of a perl module IO::Socket::SSL for a list of
+ all options with their descriptions and their defaults.
+* Supports receiving SMTP/LMTP connections through a HAProxy,
+ recognizing 'PROXY protocol Version 1' data on the first line read,
+ after a connection from HAProxy to amavisd has been established.
+ Connection data (IP addresses and ports) received via this protocol
+ end up replacing such data in the the Amavis::In::Connection object
+ ($conn).  Set configuration variable $haproxy_target_enabled (also
+ a member of policy banks) to true in order to enable this protocol.
+   * redis: allow a scoped / link-local IP address specification
+ (avoiding current limitation in IO::Socket::IP [rt.cpan.org #89608]);
+   * the Amavis::Unpackers::Part::digest method now holds a digest (SHA1,
+ hex) of a decoded (base64 or quoted-printable) MIME part contents,
+ followed by a colon and a lowercased Content-Type of the MIME part.
+ Canonical line endings CRLF in decoded textual parts are normalized
+ to a native newline (\n) before feeding them to a digest algorithm.
+* Policy bank names in a @client_ipaddr_policy setting can now accept
+ a comma-separated list of policy names to be loaded on a match
+ (for loading of policy banks based on an IP address of a SMTP client).
+ Whitespace aroun

commit amavisd-new for openSUSE:Factory

2016-01-22 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2016-01-23 01:16:51

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2015-08-13 
18:10:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2016-01-23 01:17:01.0 +0100
@@ -1,0 +2,7 @@
+Thu Jan 21 13:43:53 UTC 2016 - a...@ajaissle.de
+
+- Add amavisd-new-2.10.1-myhostname.patch:
+  $myhostname is set using POSIX::uname, but expects a FQDN. This
+  patch changes this behaviour to use Net::Domain::hostfqdn instead
+
+---

New:

  amavisd-new-2.10.1-myhostname.patch



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.aQM3lR/_old  2016-01-23 01:17:02.0 +0100
+++ /var/tmp/diff_new_pack.aQM3lR/_new  2016-01-23 01:17:02.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,8 @@
 Source5:amavis.service
 Source6:amavisd-milter.sh
 Patch1: activate_virus_scanner.diff
+# PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn()
+Patch2: amavisd-new-2.10.1-myhostname.patch
 BuildRequires:  sed
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
@@ -117,6 +119,7 @@
 %prep
 %setup -q -a 4
 %patch1 -p1
+%patch2 -p1
 for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *patch ]] ; then continue; fi

++ amavisd-new-2.10.1-myhostname.patch ++
diff -Ppru amavisd-new-2.10.1.orig/amavisd amavisd-new-2.10.1/amavisd
--- amavisd-new-2.10.1.orig/amavisd 2014-10-26 01:06:00.0 +0200
+++ amavisd-new-2.10.1/amavisd  2016-01-10 20:29:35.271354344 +0100
@@ -235,7 +235,7 @@ BEGIN {
 MIME::Head MIME::Body MIME::Entity MIME::Parser MIME::Decoder
 MIME::Decoder::Base64 MIME::Decoder::Binary MIME::Decoder::QuotedPrint
 MIME::Decoder::NBit MIME::Decoder::UU MIME::Decoder::Gzip64
-Net::LibIDN Net::Server Net::Server::PreFork
+Net::Domain Net::LibIDN Net::Server Net::Server::PreFork
   ));
   # with earlier versions of Perl one may need to add additional modules
   # to the list, such as: auto::POSIX::setgid auto::POSIX::setuid ...
@@ -981,7 +981,8 @@ BEGIN {
 
   # $myhostname is used by SMTP server module in the initial SMTP welcome line,
   # in inserted Received: lines, Message-ID in notifications, log entries, ...
-  $myhostname = (POSIX::uname)[1];  # should be a FQDN !
+  $ENV{'PATH'} = "";
+  $myhostname = Net::Domain::hostfqdn();  # should be a FQDN !
 
   $snmp_contact  = '';  # a value of sysContact OID
   $snmp_location = '';  # a value of sysLocation OID



commit amavisd-new for openSUSE:Factory

2015-08-13 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2015-08-13 18:10:43

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2014-12-17 
19:15:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2015-08-13 18:10:55.0 +0200
@@ -1,0 +2,8 @@
+Wed Aug 12 14:35:24 UTC 2015 - w...@rosenauer.org
+
+- require perl-Convert-BinHex as otherwise startup fails with
+  default installation
+- file based requirement does not work
+  -> changed to package requirement util-linux-systemd
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.954Wub/_old  2015-08-13 18:10:56.0 +0200
+++ /var/tmp/diff_new_pack.954Wub/_new  2015-08-13 18:10:56.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,14 +48,15 @@
 Requires:   perl-Archive-Zip
 Requires:   perl-BerkeleyDB
 Requires:   perl-Compress-Zlib
+Requires:   perl-Convert-BinHex
 Requires:   perl-Convert-TNEF
 Requires:   perl-Convert-UUlib
 Requires:   perl-IO-stringy
 Requires:   perl-MIME-tools
 Requires:   perl-Mail-DKIM
 Requires:   perl-MailTools
-Requires:   perl-Net-Server
 Requires:   perl-Net-LibIDN
+Requires:   perl-Net-Server
 Requires:   perl-Unix-Syslog
 Requires:   perl-spamassassin
 Requires:   sharutils
@@ -66,7 +67,6 @@
 PreReq: pwdutils
 PreReq: %insserv_prereq
 PreReq: util-linux
-PreReq: /bin/logger
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
@@ -83,6 +83,10 @@
 Recommends: p7zip
 Recommends: binutils
 Recommends: %{name}-docs = %{version}
+%if 0%{?suse_version} > 1310
+Requires(pre):  util-linux-systemd
+Requires(post): util-linux-systemd
+%endif
 Provides:   amavisd-milter = 1.6.0
 Obsoletes:  amavisd-milter <= 1.5.0
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build




commit amavisd-new for openSUSE:Factory

2014-12-17 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2014-12-17 19:15:52

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2014-11-11 
01:11:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2014-12-17 19:15:05.0 +0100
@@ -1,0 +2,189 @@
+Tue Dec 16 20:26:10 UTC 2014 - p.drou...@gmail.com
+
+- Update to version 2.10.1
+  + fixed a missing import of mail_addr_idn_to_ascii() and idn_to_utf8()
+when SQL is in use
+  + void warnings issued by perl 5.21.5:
+- Changes from version 2.10
+COMPATIBILITY
+- New requirement: perl module Net::LibIDN needs to be installed.
+- Uses a perl module File::LibMagic if installed, instead of spawning
+  a file(1) utility.
+- Support for international email relies heavily on perl to do the
+  right thing in its support of Unicode, so using a reasonably recent
+  version of perl is recommended. Amavisd was tested with perl 5.18
+  and 5.20.1. Versions of perl older than 5.12 may cause problems
+  with handling, encoding, and decoding of Unicode characters.
+  It is reasonable to expect that versions 5.14 and 5.16 are fine too,
+  but have not been tested extensively.
+- Default log templates and notification templates have changed
+  in details (like in decoding of international e-mail addresses), so
+  if locally customized templates are in use these will benefit from
+  updating - otherwise expect some mojibake in log and notifications.
+- International domain names (IDN) encoded in ASCII-compatible encoding
+  found in e-mail addresses and in Message-ID header field will be decoded
+  to Unicode for presentation purposes (syslog, JSON structured log,
+  notifications). This decoding does not affect a mail message itself.
+- Logging via syslog expects that syslogd (or equivalent) will not
+  clobber UTF-8 octets. It may be necessary to tell syslogd to accept
+  C1 control characters unchanged, e.g. by adding a command line option
+  "-8" to syslogd. Failing to do so may leave logged entries (like
+  sender and recipient address, From, Subject) in international mail
+  garbled or poorly readable in syslog.
+  On FreeBSD one should add:  syslogd_flags="-8"  to /etc/rc.conf.
+- Third party log parsers may need updating to accept logs with Unicode
+  characters in UTF-8 encoding.
+- A SMTP response to an EHLO command will now announce SMTPUTF8 capability
+  by default.
+
+BUG FIXES
+- releasing a message from an SQL quarantine was broken in version 2.9.1
+  due to introduction of parent_mail_id(); patches provided by Stef Simoens
+  and Gionatan Danti;
+- if checking of a message was aborted prematurely (like due to a timeout
+  or some fatal error), JSON log could receive a copy of a previous
+  log entry;
+- prevent non-ASCII non-UTF-8 octets from reaching a JSON log/report
+  (which produced an invalid JSON object and Elasticsearch complaining);
+- allow SMTP commands MAIL FROM and RCPT TO to accept options without
+  values, as allowed by the RFC 5321 syntax;
+- in delivery status notification (DSN) the field Received-From-MTA
+  specified 'smtp' as mta-name-type, instead of a 'dns' as prescribed
+  in RFC 3464;
+- releasing from a quarantine left envelope sender address as '<>'
+  instead of using the address found in a Return-Path header field
+  of a quarantined message, while also logging a warning:
+Quarantine release $QID: missing X-Envelope-From or Return-Path
+  reported by Pascal Volk;
+- avoid failure in os_fingerprint or in smtp forwarding in certain cases
+  where the $os_fingerprint_method or $forward_method or $notify_method
+  uses an asterisk in place of a host IP address or port number.
+  The reported error in os_fingerprint (reported by -ben) was:
+os_fingerprint FAILED: Insecure dependency in socket
+  while running with -T switch
+  at /usr/lib/perl/5.18/IO/Socket.pm line 80
+  and in SMTP forwarding or notification (reported by Dennis Boone):
+(!)connect to *:10025 attempt #1:
+  Insecure dependency in socket while running with -T switch
+  at /usr/lib/perl/5.18/IO/Socket.pm line 80.
+- files LDAP.ldif and LDAP.schema: added a missing attribute
+  amavisDisclaimerOptions to objectClass; reported by Quanah Gibson-Mount;
+
+NEW FEATURES
+- added support for Internationalized Email:
+  * RFC 6530 - Overview and Framework for Internationalized Email
+  * RFC 6531 - SMTP Extension for Internationalized Email (SMTPUTF8)
+  * RFC 6532 - Internationalized Email Headers
+  * RFC 6533 - Internationalized Delivery Status Notifications
+  This supports UTF-8 (EAI) in SMTP/LMTP sender addresses, recipient
+  addresses, 

commit amavisd-new for openSUSE:Factory

2014-11-10 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2014-11-11 01:10:43

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2014-08-18 
11:24:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2014-11-11 01:11:28.0 +0100
@@ -1,0 +2,7 @@
+Sun Nov 09 00:46:00 UTC 2014 - Led 
+
+- fix bashism in post script
+- remove '-e' option of 'echo' command that may be unsupported in some
+  POSIX-complete shells
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.rg8p4r/_old  2014-11-11 01:11:30.0 +0100
+++ /var/tmp/diff_new_pack.rg8p4r/_new  2014-11-11 01:11:30.0 +0100
@@ -203,10 +203,10 @@
 else
   if [ -r etc/aliases ]; then
 if ! grep -q "^virusalert:" etc/aliases; then
-  echo -e "virusalert:\troot" >> etc/aliases
+  echo "virusalert:root" >> etc/aliases
   %{logmsg} "Added alias for user virusalert to /etc/aliases"
   if [ -x usr/bin/newaliases ]; then
-  usr/bin/newaliases &>/dev/null || true
+  usr/bin/newaliases >/dev/null 2>&1 || true
   else
   %{logmsg} "Cannot execute newaliases. Please run it manually."
   fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2014-08-18 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2014-08-18 11:23:58

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2014-07-29 
16:49:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2014-08-18 11:24:01.0 +0200
@@ -1,0 +2,5 @@
+Sat Aug 16 10:31:29 CEST 2014 - r...@suse.de
+
+- add /bin/logger as prereq (util-linux split)
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.QrGieY/_old  2014-08-18 11:24:02.0 +0200
+++ /var/tmp/diff_new_pack.QrGieY/_new  2014-08-18 11:24:02.0 +0200
@@ -65,6 +65,7 @@
 PreReq: pwdutils
 PreReq: %insserv_prereq
 PreReq: util-linux
+PreReq: /bin/logger
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2014-07-29 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2014-07-29 16:48:41

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2014-01-08 
20:05:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2014-07-29 16:49:13.0 +0200
@@ -1,0 +2,41 @@
+Sun Jul 27 15:35:21 UTC 2014 - w...@rosenauer.org
+
+- update to version 2.9.1
+  COMPATIBILITY
+  There are no known incompatibilities between versions 2.9.0 and 2.9.1.
+
+  Additional bugfixes and also:
+  - updated decoding of RAR archives to recognize a changed format in output
+of 'unrar' utility version 5; based on a patch by amavis17(at)iotti.biz
+  - avoid tempfailing a message if a redis server is down, just log the
+error and carry on;
+  - some minor logging changes to facilitate troubleshooting;
+- changes in 2.9
+  COMPATIBILITY
+  This version drops dependency on a Perl module Redis, and makes
+  dependencies on modules Convert::TNEF and Convert::UUlib truly optional.
+  The following change may affect third-party log parsers:
+  To facilitate forensic log analysis and troubleshooting, log entries
+  'FWD from' and 'SEND from' at level 1 now carry one additional
+  prefixed information field which is the unique internal mail_id of
+  the message, possibly followed by a parent_mail_id in parenthesis,
+  No other incompatibilities with a previous version 2.8.1 are expected.
+
+  NEW FEATURES SUMMARY
+  - structured log/reporting to a Redis server in JSON format;
+  - IP address reputation (uses a Redis server);
+  - added two minor content categories to the major ccat CC_UNCHECKED
+(encrypted (=1) and over-limits/mail-bomb (=2) );
+  - introduced a by-recipient setting %final_destiny_maps_by_ccat.
+- update amavisd-milter to 1.6.0
+  * New features:
+Added new amavisd-milter option -B which passes value of
+{daemon_name} milter macro as amavisd-new policy bank name.
+  * Bug and compatibility fixes:
+Added amavisd-milter.spec for compilation with rpmbuild.
+Fixed typo which prevents using LDFLAGS on Debian.
+Fixed missing definition of true and false in libmilter/mfapi.h.
+- upstream packages as tar.xz -> added xz as BuildRequires to
+  support building for older dists
+
+---

Old:

  amavisd-milter.tar.bz2
  amavisd-new-2.8.1.tar.gz

New:

  amavisd-milter-1.6.0.tar.gz
  amavisd-new-2.9.1.tar.xz



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.pjHlja/_old  2014-07-29 16:49:14.0 +0200
+++ /var/tmp/diff_new_pack.pjHlja/_new  2014-07-29 16:49:14.0 +0200
@@ -23,23 +23,24 @@
 %define avuser vscan
 %define avgroupvscan
 Name:   amavisd-new
-Version:2.8.1
+Version:2.9.1
 Release:0
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
-Source0:amavisd-new-%{version}.tar.gz
+Source0:amavisd-new-%{version}.tar.xz
 Source1:sysconfig.amavis
 Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
-Source4:amavisd-milter.tar.bz2
+Source4:amavisd-milter-1.6.0.tar.gz
 Source5:amavis.service
 Source6:amavisd-milter.sh
 Patch1: activate_virus_scanner.diff
 BuildRequires:  sed
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
+BuildRequires:  xz
 Requires:   bzip2
 Requires:   file
 Requires:   gzip
@@ -80,7 +81,7 @@
 Recommends: p7zip
 Recommends: binutils
 Recommends: %{name}-docs = %{version}
-Provides:   amavisd-milter = 1.5.0
+Provides:   amavisd-milter = 1.6.0
 Obsoletes:  amavisd-milter <= 1.5.0
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -114,7 +115,7 @@
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *spec ]] ; then continue; fi
-if [[ $i == amavisd-milter ]] ; then continue; fi
+if [[ $i == amavisd-milter* ]] ; then continue; fi
 echo "patching file $i"
 sed -i "s|\$daemon_user  = 'vscan';|\$daemon_user  = '%{avuser}';|g; \
 s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \
@@ -127,7 +128,7 @@
 # ---
 
 %build
-cd amavisd-milter
+cd amavisd-milter*
 export CFLAGS="%{optflags}"
 %configure --localstatedir="%{avspool}"
 make %{?_smp_mflag

commit amavisd-new for openSUSE:Factory

2014-01-08 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2014-01-08 20:05:51

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-11-15 
13:12:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2014-01-08 20:05:52.0 +0100
@@ -1,0 +2,9 @@
+Wed Jan  1 13:17:13 UTC 2014 - w...@rosenauer.org
+
+- add some recommended decoders (bnc#754852)
+- fixed amavisd-milter invocation (bnc#809969)
+- correctly set clamd socket to (/var/run/clamav/clamd-socket)
+  (bnc#844575)
+- some spec file cleanup including using optflags for native code
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.24zt2z/_old  2014-01-08 20:05:54.0 +0100
+++ /var/tmp/diff_new_pack.24zt2z/_new  2014-01-08 20:05:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,28 @@
 #
 
 
+%define avspool/var/spool/amavis
+%define avdb   /var/spool/amavis/db
+%define avquarantine   /var/spool/amavis/virusmails
+%define logmsg logger -t %{name}/rpm
+%define avuser vscan
+%define avgroupvscan
 Name:   amavisd-new
+Version:2.8.1
+Release:0
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0+
 Group:  Productivity/Networking/Security
-Version:2.8.1
-Release:0
 Url:http://www.ijs.si/software/amavisd/
+Source0:amavisd-new-%{version}.tar.gz
+Source1:sysconfig.amavis
+Source2:rc.amavis
+Source3:amavisd-new-rpmlintrc
+Source4:amavisd-milter.tar.bz2
+Source5:amavis.service
+Source6:amavisd-milter.sh
+Patch1: activate_virus_scanner.diff
+BuildRequires:  sed
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
 Requires:   bzip2
@@ -44,6 +59,11 @@
 Requires:   sharutils
 Requires:   smtp_daemon
 Requires:   zoo
+PreReq: coreutils
+PreReq: net-tools
+PreReq: pwdutils
+PreReq: %insserv_prereq
+PreReq: util-linux
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
@@ -57,27 +77,12 @@
 Recommends: perl-ldap
 Recommends: perl-Authen-SASL
 Recommends: perl-Mail-ClamAV
+Recommends: p7zip
+Recommends: binutils
 Recommends: %{name}-docs = %{version}
 Provides:   amavisd-milter = 1.5.0
 Obsoletes:  amavisd-milter <= 1.5.0
-PreReq: coreutils net-tools sed pwdutils
-PreReq: %insserv_prereq
-PreReq: util-linux
-Source0:amavisd-new-%{version}.tar.gz
-Source1:sysconfig.amavis
-Source2:rc.amavis
-Source3:amavisd-new-rpmlintrc
-Source4:amavisd-milter.tar.bz2
-Source5:amavis.service
-Source6:amavisd-milter.sh
-Patch1: activate_virus_scanner.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%define avspool/var/spool/amavis
-%define avdb   /var/spool/amavis/db
-%define avquarantine   /var/spool/amavis/virusmails
-%define logmsg logger -t %{name}/rpm
-%define avuser vscan
-%define avgroupvscan
 
 %description
 Amavisd-new is a high-performance interface between mailer (MTA) and
@@ -100,7 +105,7 @@
 content checkers: virus scanners or SpamAssassin. It talks to the MTA
 via (E)SMTP, LMTP.
 
-This package contains the documentation and Relase-Notes.
+This package contains the documentation and Release-Notes.
 
 %prep
 %setup -q -a 4
@@ -110,62 +115,63 @@
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *spec ]] ; then continue; fi
 if [[ $i == amavisd-milter ]] ; then continue; fi
+echo "patching file $i"
 sed -i "s|\$daemon_user  = 'vscan';|\$daemon_user  = '%{avuser}';|g; \
 s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \
 s|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \
 s|/var/amavis/db|%{avdb}|g; \
 s|/var/virusmails|%{avquarantine}|g; \
-s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \
-s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i
+s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g" $i
 d

commit amavisd-new for openSUSE:Factory

2013-11-15 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-11-15 13:12:12

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-10-23 
13:11:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-11-15 13:12:14.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov 12 13:40:03 UTC 2013 - w...@rosenauer.org
+
+- Add real systemd support; add required macros in %post/postun sections
+  and drop sysvinit support on openSUSE >= 12.3
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.eRFL5M/_old  2013-11-15 13:12:15.0 +0100
+++ /var/tmp/diff_new_pack.eRFL5M/_new  2013-11-15 13:12:15.0 +0100
@@ -79,12 +79,6 @@
 %define avuser vscan
 %define avgroupvscan
 
-%if %suse_version > 1220
-%define _unitdir /usr/lib/systemd
-%else
-%define _unitdir /lib/systemd
-%endif
-
 %description
 Amavisd-new is a high-performance interface between mailer (MTA) and
 content checkers: virus scanners or SpamAssassin. It talks to the MTA
@@ -135,14 +129,13 @@
 # ---
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{avquarantine}
-mkdir -p $RPM_BUILD_ROOT/%{avspool}/{tmp,var}
-mkdir -p $RPM_BUILD_ROOT/%{avdb}
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{avquarantine}
+mkdir -p $RPM_BUILD_ROOT%{avspool}/{tmp,var}
+mkdir -p $RPM_BUILD_ROOT%{avdb}
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
-mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
+mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis 
$RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd
@@ -151,13 +144,18 @@
 install -m 755 amavisd-release $RPM_BUILD_ROOT/%{_sbindir}/amavisd-release
 install -m 755 p0f-analyzer.pl $RPM_BUILD_ROOT/%{_sbindir}/p0f-analyzer.pl
 install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf
-install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis
-ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system
 %if 0%{?suse_version} > 1140
-install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir}/system/
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir}
+%endif
+%if 0%{?suse_version} < 1230
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis
+ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
+%else
+ln -s ../../sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
 %endif
 install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/
 cd amavisd-milter
@@ -169,12 +167,27 @@
 /usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" 
-d %{avspool} %{avuser} 2> /dev/null || :
 /usr/sbin/usermod %{avuser} -g %{avgroup} 2> /dev/null || :
 %{logmsg} "Added user %{avuser} for package %{name}"
+%if 0%{?suse_version} > 1140
+%service_add_pre amavis.service
+%endif
 
 %preun
+%if 0%{?suse_version} < 1230
 %stop_on_removal amavis
+%endif
+%if 0%{?suse_version} > 1140
+%service_del_preun amavis.service
+%endif
 
 %post
+%if 0%{?suse_version} < 1230
 %{fillup_and_insserv -n amavis amavis}
+%else
+%fillup_only
+%endif
+%if 0%{?suse_version} > 1140
+%service_add_post amavis.service
+%endif
 # Update ?
 if [ ${1:-0} -gt 1 ]; then
  : OK currently nothing to do
@@ -193,8 +206,13 @@
 fi
 
 %postun
+%if 0%{?suse_version} < 1230
 %restart_on_update amavis
 %{insserv_cleanup}
+%endif
+%if 0%{?suse_version} > 1140
+%service_del_postun amavis.service
+%endif
 
 %files
 %defattr(-,root,root)
@@ -203,14 +221,16 @@
 %dir /etc/openldap
 %dir /etc/openldap/schema
 %dir /usr/lib/tmpfiles.d
+%if 0%{?suse_version} < 1230
 %config /etc/init.d/amavis
+%endif
 %config(noreplace) /etc/amavisd.conf
 %config(noreplace) /etc/openldap/schema/amavisd-new.schema
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
 %if 0%{?suse_version} > 1140
-%config %{_unitdir}/system/amavis.service
+%{_unitdir}/amavis.service
 /usr/sbin/amavisd-milter.sh
 %endif
 %defattr(0750,%{avuser},%{avgroup}, 0750)

-- 
To unsu

commit amavisd-new for openSUSE:Factory

2013-10-23 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-10-23 13:11:02

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-10-04 
15:56:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-10-23 13:11:03.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct 22 15:51:56 UTC 2013 - vark...@suse.com
+
+- bnc#844575 - amavis received a change where /var/run was replaced
+   with /run still /var/run is present
+
+---



Other differences:
--
++ activate_virus_scanner.diff ++
--- /var/tmp/diff_new_pack.A1pY6i/_old  2013-10-23 13:11:04.0 +0200
+++ /var/tmp/diff_new_pack.A1pY6i/_new  2013-10-23 13:11:04.0 +0200
@@ -11,7 +11,7 @@
 -#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 +['ClamAV-clamd',
-+   \&ask_daemon, ["CONTSCAN {}\n", "/run/clamav/clamd-socket"],
++   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd-socket"],
 +   qr/\bOK$/m, qr/\bFOUND$/m,
 +   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
  # # NOTE: run clamd under the same user as amavisd - or run it under its own

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-10-04 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-10-04 15:56:22

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-09-25 
16:57:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-10-04 15:56:23.0 +0200
@@ -1,0 +2,5 @@
+Thu Oct  3 15:56:34 UTC 2013 - opens...@cboltz.de
+
+- fix clamd socket location (bnc#809580)
+
+---



Other differences:
--
++ activate_virus_scanner.diff ++
--- /var/tmp/diff_new_pack.qNmrE0/_old  2013-10-04 15:56:24.0 +0200
+++ /var/tmp/diff_new_pack.qNmrE0/_new  2013-10-04 15:56:24.0 +0200
@@ -1,8 +1,8 @@
-diff --git a/amavisd.conf b/amavisd.conf
-index 7f2c25c..ac61272 100644
 a/amavisd.conf
-+++ b/amavisd.conf
-@@ -371,10 +371,10 @@ $banned_filename_re = new_RE(
+Index: amavisd.conf
+===
+--- a/amavisd.conf.orig2012-08-30 17:00:16.0 +0200
 b/amavisd.conf 2013-10-03 17:55:16.010474859 +0200
+@@ -376,10 +376,10 @@ $banned_filename_re = new_RE(
  # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
  
  # ### http://www.clamav.net/
@@ -11,7 +11,7 @@
 -#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 +['ClamAV-clamd',
-+   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
++   \&ask_daemon, ["CONTSCAN {}\n", "/run/clamav/clamd-socket"],
 +   qr/\bOK$/m, qr/\bFOUND$/m,
 +   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
  # # NOTE: run clamd under the same user as amavisd - or run it under its own

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-09-25 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-09-25 16:57:57

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-09-16 
09:33:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-09-25 16:57:59.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 25 09:10:34 UTC 2013 - vark...@suse.com
+
+- bnc#831556 - naming mismatch for amavis and systemd 
+
+---

Old:

  amavisd.service

New:

  amavis.service



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.by8a99/_old  2013-09-25 16:57:59.0 +0200
+++ /var/tmp/diff_new_pack.by8a99/_new  2013-09-25 16:57:59.0 +0200
@@ -68,7 +68,7 @@
 Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
 Source4:amavisd-milter.tar.bz2
-Source5:amavisd.service
+Source5:amavis.service
 Source6:amavisd-milter.sh
 Patch1: activate_virus_scanner.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -210,7 +210,7 @@
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
 %if 0%{?suse_version} > 1140
-%config %{_unitdir}/system/amavisd.service
+%config %{_unitdir}/system/amavis.service
 /usr/sbin/amavisd-milter.sh
 %endif
 %defattr(0750,%{avuser},%{avgroup}, 0750)

++ amavisd.service -> amavis.service ++
--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd.service  2013-06-05 
13:27:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavis.service  2013-09-25 
16:57:59.0 +0200
@@ -1,4 +1,4 @@
-# This file is part of package amavisd.
+# This file is part of package amavisd-new.
 #
 # Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
 # Author: Werner Fink

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-09-16 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-09-16 09:33:31

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-06-05 
13:27:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-09-16 09:33:33.0 +0200
@@ -1,0 +2,33 @@
+Sat Sep 14 18:40:10 UTC 2013 - w...@rosenauer.org
+
+- update to version 2.8.1
+  COMPATIBILITY
+  when 0MQ (a.k.a. ZeroMQ) is used between Amavis components as an
+  internal messaging protocol, make sure to replace all 0MQ-enabled
+  Amavis components on upgrading amavisd, as the internal protocol
+  has changed slightly, taking advantage of 0MQ multi-part messages
+  for better performance. Affected programs are: amavis-services,
+  amavisd-status, amavisd-snmp-subagent-zmq, and amavisd.
+
+  NOTE: The Crossroads I/O project (libxs) ceased development on
+July 2012, to be replaced by nanomsg eventually by the same author.
+
+The 0MQ library (libzmq) is currently (2013) the best choice,
+the preferred library version is 3.2.2 or later along with
+the ZMQ::LibZMQ3 Perl interface module and ZMQ::Constants.
+The older version 2 of the library, along with an older perl
+module ZeroMQ, should be fine too, but lacks support for IPv6.
+
+  amavisd is compatible with perl 5.18.0 and with SpamAssassin 3.4.0
+
+  NEW FEATURES SUMMARY
+  * new Redis storage for the "pen pals" feature;
+  * improved IPv6 support;
+  * support for p0f v3;
+  * new macros ip_trace_all and ip_trace_public;
+  * amavisd-status now shows a bar graph display
+of the number of active processes;
+  * the timing report log entry can show CPU usage
+at log level 2 if a module Unix::Getrusage is available;
+
+---

Old:

  amavisd-new-2.8.0.tar.gz

New:

  amavisd-new-2.8.1.tar.gz



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.YaPcYc/_old  2013-09-16 09:33:34.0 +0200
+++ /var/tmp/diff_new_pack.YaPcYc/_new  2013-09-16 09:33:34.0 +0200
@@ -20,7 +20,7 @@
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0+
 Group:  Productivity/Networking/Security
-Version:2.8.0
+Version:2.8.1
 Release:0
 Url:http://www.ijs.si/software/amavisd/
 BuildRequires:  sendmail

++ amavisd-new-2.8.0.tar.gz -> amavisd-new-2.8.1.tar.gz ++
 11174 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-06-05 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-06-05 13:27:04

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-05-02 
12:32:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-06-05 13:27:05.0 +0200
@@ -1,0 +2,7 @@
+Wed May 29 20:03:41 UTC 2013 - crrodrig...@opensuse.org
+
+- Fix multiple bugs in systemd unit, syslog.target should 
+  not be used and Wants must be used instead of requires in most
+  cases.
+
+---



Other differences:
--
++ amavisd.service ++
--- /var/tmp/diff_new_pack.CUm1TD/_old  2013-06-05 13:27:05.0 +0200
+++ /var/tmp/diff_new_pack.CUm1TD/_new  2013-06-05 13:27:05.0 +0200
@@ -14,12 +14,12 @@
 
 [Unit]
 Description=Amavisd-new Virus Scanner interface
-Requires=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
-After=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
+Requires=var-run.mount
+Wants=nss-lookup.target network.target remote-fs.target time-sync.target
+After=var-run.mount nss-lookup.target network.target remote-fs.target 
time-sync.target
 Wants=named.service clamd.service
 After=named.service clamd.service
 Before=mail-transfer-agent.target
-Conflicts=
 
 [Service]
 Type=forking

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-05-02 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-05-02 12:32:56

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-02-25 
21:40:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-05-02 12:32:58.0 +0200
@@ -1,0 +2,5 @@
+Thu May  2 07:45:54 UTC 2013 - meiss...@suse.com
+
+- use %defattr correctly to make /var/spool/amavis not worldreadable.
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.s89ajN/_old  2013-05-02 12:33:01.0 +0200
+++ /var/tmp/diff_new_pack.s89ajN/_new  2013-05-02 12:33:01.0 +0200
@@ -213,7 +213,7 @@
 %config %{_unitdir}/system/amavisd.service
 /usr/sbin/amavisd-milter.sh
 %endif
-%defattr(0750,%{avuser},%{avgroup})
+%defattr(0750,%{avuser},%{avgroup}, 0750)
 %dir %{avspool}
 %dir %{avspool}/tmp
 %dir %{avspool}/db

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-02-25 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-02-25 21:40:07

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2013-02-08 
07:06:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-02-25 21:40:08.0 +0100
@@ -1,0 +2,6 @@
+Mon Feb 25 08:09:22 UTC 2013 - m...@suse.com
+
+- Install amavisd.service accordingly (/usr/lib/systemd for 12.3 
+  and up or /lib/systemd for older versions).  
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.6eQjcM/_old  2013-02-25 21:40:12.0 +0100
+++ /var/tmp/diff_new_pack.6eQjcM/_new  2013-02-25 21:40:12.0 +0100
@@ -79,6 +79,12 @@
 %define avuser vscan
 %define avgroupvscan
 
+%if %suse_version > 1220
+%define _unitdir /usr/lib/systemd
+%else
+%define _unitdir /lib/systemd
+%endif
+
 %description
 Amavisd-new is a high-performance interface between mailer (MTA) and
 content checkers: virus scanners or SpamAssassin. It talks to the MTA
@@ -149,9 +155,9 @@
 ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system
 %if 0%{?suse_version} > 1140
-install -m 644 %{S:5} $RPM_BUILD_ROOT/lib/systemd/system/
+install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir}/system/
 %endif
 install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/
 cd amavisd-milter
@@ -204,7 +210,7 @@
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
 %if 0%{?suse_version} > 1140
-%config /lib/systemd/system/amavisd.service
+%config %{_unitdir}/system/amavisd.service
 /usr/sbin/amavisd-milter.sh
 %endif
 %defattr(0750,%{avuser},%{avgroup})

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2013-02-07 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2013-02-08 07:06:33

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2012-12-28 
14:56:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2013-02-08 07:06:35.0 +0100
@@ -1,0 +2,81 @@
+Wed Feb  6 08:52:23 UTC 2013 - a...@ajaissle.de
+
+- update to version 2.8.0
+
+- COMPATIBILITY 2.8.0
+  * removed an old compatibility measure: default value of @banned_admin_maps
+was changed from:
+  @banned_admin_maps = (\$banned_admin, \%virus_admin, \$virus_admin);
+to a more consistent:
+  @banned_admin_maps = (\$banned_admin);
+The previous default value of @banned_admin_maps tried to maintain
+compatibility with versions before the setting was separated from
+its companion @virus_admin_maps. Now this compatibility is no longer
+considered necessary and contributes to some confusion, so it was dropped.
+See 2.4.0 and 2.2.1 release notes for previous changes to this setting.
+  * quarantining to an mbox format file used to include a local time in an
+mbox separator line, which differs from RFC 4155 and common practices
+of using an UTC timestamp; a time zone of a timestamp in separator lines
+is now changed to UTC;
+
+- BUG FIXES 2.8.0
+  * fixed initial evaluation of dynamic (i.e. per policy bank) values of
+$enable_dkim_verification, $enable_dkim_signing and $bypass_decode_parts
+across all declared policy banks; these policy bank entries may be scalars
+of references to such;
+  * finely adjust a message size for de-stuffed dots according to a size
+definition in RFC 1870; avoids occasional message size mismatch when
+using an antispam interface module SpamdClient (implementing client-side
+of a spamc/spamd protocol);
+  * updated LDAP.ldif to match LDAP.schema; provided by Quanah Gibson-Mount;
+  * updated AMAVIS-MIB.txt and amavisd-snmp-subagent: changed type of
+SNMP variables *MsgsSize* in the group amavisStats 7 from Counter32
+to Counter64 for consistency with other *MsgsSize* variables in groups
+amavisStats 3 and amavisStats 9;
+
+- NEW FEATURES SUMMARY 2.8.0
+  * For monitoring and statistics gathering purposes a new set of utilities
+and service processes is available based on a message passing paradigm,
+using a 0MQ (a.k.a. ZMQ, ZeroMQ, or Crossroads I/O) library. This
+replaces a functionally similar set of utilities based on a shared
+BerkeleyDB database, with a benefit of avoiding lock contention
+altogether. This can bring sigificant speedups, most pronounced on
+a host with many busy amavisd child processes.
+  * Applied numerous fine-grained optimizations based on a NYTProf profiler
+results. Optimizations include a reduction in a number of generated
+Perl opcodes and similar micro-optimizations. This accounts for a large
+amount of small changes in the code.
+  * Our current statistics (Q4 2011) shows that 80 % of messages are below
+30.000 bytes, and 90 % of mail messages are below 100.000 bytes in
+size. As an optimization, messages below 100 KiB in size are now kept
+and processed in memory, including passing them more optimally to
+SpamAssassin 3.4.0. Some file activity is still there, but is much
+reduced. If $TEMPBASE also resides on an SSD disk (or a RAM disk),
+observed speedup between 2.7.2 and 2.8.0 was 3 to 8 percent on a
+busy host (with monitoring disabled, so as not to skew a measurement).
+  * Use a module IO::Socket::IP if available, instead of dealing directly
+with low-level modules IO::Socket::INET and IO::Socket::INET6;
+  * choose more appropriate defaults if running on an IPv6-only host
+(like connecting to ::1 instead of 127.0.0.1 which may not exist);
+  * amavisd-release now also supports connecting to amavisd over IPv6;
+  * as a debugging aid it is now possible that a late event triggers full
+logging of earlier events that occurred during processing of a current
+mail message;
+  * $enable_ldap setting is now dynamic, i.e. can be changed by a policy
+bank, which makes it possible to selectively disable LDAP lookups
+per policy bank;
+  * optionally avoid persistent connections to SQL and LDAP servers;
+  * it is now possible to disable calling an external file(1) utility
+but still have MIME parts decoding enabled;
+  * added support in Amavis::SpamControl::ExtProg for an external spam scanner
+Bogofilter;
+  * added locking options to @spam_scanners entries, to be used with external
+sc

commit amavisd-new for openSUSE:Factory

2012-12-28 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2012-12-28 14:55:22

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2012-08-31 
09:13:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2012-12-28 14:55:24.0 +0100
@@ -1,0 +2,24 @@
+Thu Dec 27 23:29:51 UTC 2012 - w...@rosenauer.org
+
+- update to version 2.7.2
+  * a generated Received header field was missing the 'IPv6:' prefix
+in the TCP-info component of a 'by' subfield (as required by RFC 5321,
+section 4.1.3) when amavisd received a message over an IPv6 protocol;
+(btw, the TCP-info component of a 'from' subfield was correct);
+  * changed data type of an SNMP variable LogRetries from C32 to C64
+for consistency with the MIB;
+  * updated AV entry 'AVG Anti-Virus' to consider status 403 continuation
+lines when searching for a virus name; suggested by Ralf Hildebrandt;
+  * reduce a log level to 5 on a log message:
+Amavis::IO::RW: Error flushing on close: ...
+to avoid an innocent but sinister-looking warning when a pipe
+to a virus scanner is broken and needs to be re-established;
+reported by Stefan Jakobs
+  * updated an AV entry for 'F-Secure Linux Security' to version 9.14;
+options updated by Mika Ilmaranta, a patch by Tuomo Soini;
+  * fix a Unix socket compatibility issue with Net::Server versions 2.000,
+2.001 and 2.002, where a method NS_unix_path no longer exists.
+This method was re-introduced for compatibility reasons in 2.003.
+Reported by Paul MacKenzie;
+
+---

Old:

  amavisd-new.tar.bz2

New:

  amavisd-new-2.7.2.tar.gz



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.0JWEt0/_old  2012-12-28 14:55:26.0 +0100
+++ /var/tmp/diff_new_pack.0JWEt0/_new  2012-12-28 14:55:26.0 +0100
@@ -20,7 +20,7 @@
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0+
 Group:  Productivity/Networking/Security
-Version:2.7.0
+Version:2.7.2
 Release:0
 Url:http://www.ijs.si/software/amavisd/
 BuildRequires:  sendmail
@@ -63,7 +63,7 @@
 PreReq: coreutils net-tools sed pwdutils
 PreReq: %insserv_prereq
 PreReq: util-linux
-Source0:amavisd-new.tar.bz2
+Source0:amavisd-new-%{version}.tar.gz
 Source1:sysconfig.amavis
 Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
@@ -104,7 +104,7 @@
 
 %prep
 %setup -q -a 4
-%patch1
+%patch1 -p1
 for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *patch ]] ; then continue; fi

++ activate_virus_scanner.diff ++
--- /var/tmp/diff_new_pack.0JWEt0/_old  2012-12-28 14:55:26.0 +0100
+++ /var/tmp/diff_new_pack.0JWEt0/_new  2012-12-28 14:55:26.0 +0100
@@ -1,30 +1,19 @@
 amavisd.conf   2011-07-01 18:21:01.0 +0200
-+++ ../amavisd-new-2.7.0/amavisd.conf  2011-09-13 15:39:02.360975002 +0200
-@@ -349,6 +349,12 @@
- 
- @av_scanners = (
- 
-+### Avira for UNIX 3.x
-+## from http://forum.avira.com/wbb/index.php?page=Thread&postID=812607 ###
-+['Avira AntiVir', ['avscan'],
-+  '-s --batch --alert-action=none {}', [0], qr/(?:ALERT|FUND):/m,
-+  qr/(?:ALERT|FUND): (.[^;]+) ;/m ],
-+
- # ### http://www.sophos.com/
- # ['Sophos-SSSP',
- #   \&ask_daemon, ["{}", 'sssp:/var/run/savdi/sssp.sock'],
-@@ -371,10 +377,10 @@
+diff --git a/amavisd.conf b/amavisd.conf
+index 7f2c25c..ac61272 100644
+--- a/amavisd.conf
 b/amavisd.conf
+@@ -371,10 +371,10 @@ $banned_filename_re = new_RE(
  # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
  
  # ### http://www.clamav.net/
 -# ['ClamAV-clamd',
--#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
+-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
 -#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 +['ClamAV-clamd',
-+   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
++   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
 +   qr/\bOK$/m, qr/\bFOUND$/m,
 +   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
- # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # # NOTE: run clamd under the same user as amavisd - or run it under its own
  # #   uid such as clamav, add user clamav to the amavis group, and then add
  # #

commit amavisd-new for openSUSE:Factory

2012-08-31 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2012-08-31 09:13:14

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2012-06-26 
15:13:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2012-08-31 09:13:16.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 27 09:14:08 UTC 2012 - dmuel...@suse.com
+
+- unarj was dropped from Factory, remove dependency to it
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.0j9swY/_old  2012-08-31 09:13:19.0 +0200
+++ /var/tmp/diff_new_pack.0j9swY/_new  2012-08-31 09:13:19.0 +0200
@@ -43,7 +43,6 @@
 Requires:   perl-spamassassin
 Requires:   sharutils
 Requires:   smtp_daemon
-Requires:   unarj
 Requires:   zoo
 %if 0%{?suse_version} < 1120
 Requires:   lha

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2012-06-26 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2012-06-26 15:13:28

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2012-05-09 
18:28:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2012-06-26 15:13:29.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun 25 10:36:36 UTC 2012 - vark...@suse.com
+
+- fix the systemd service file 
+
+---



Other differences:
--
++ amavisd.service ++
--- /var/tmp/diff_new_pack.Wvpe1O/_old  2012-06-26 15:13:32.0 +0200
+++ /var/tmp/diff_new_pack.Wvpe1O/_new  2012-06-26 15:13:32.0 +0200
@@ -30,8 +30,7 @@
 ExecStart=/usr/sbin/amavisd start
 ExecStartPost=
 ExecStartPost=
-ExecReload=/usr/sbin/postfix reload
-ExecReload=/usr/sbin/postfix flush
+ExecReload=/usr/sbin/amavisd reload
 ExecStop=/usr/sbin/amavisd stop
 ExecStopPost=/usr/sbin/amavisd-milter.sh stop
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2012-05-09 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2012-05-09 18:08:15

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2012-01-05 
13:47:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2012-05-09 18:28:33.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 26 21:11:48 UTC 2012 - ch...@computersalat.de
+
+- fix build for < 1210
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.rInWJK/_old  2012-05-09 18:28:34.0 +0200
+++ /var/tmp/diff_new_pack.rInWJK/_new  2012-05-09 18:28:34.0 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
 License:GPL-2.0+
@@ -24,12 +25,26 @@
 Url:http://www.ijs.si/software/amavisd/
 BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
-Requires:   gzip bzip2 unarj zoo sharutils file
-Requires:   perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy
-Requires:   perl-MIME-tools perl-MailTools perl-Archive-Tar 
perl-Unix-Syslog
-Requires:   perl-Convert-TNEF perl-Archive-Zip perl-Net-Server 
perl-spamassassin
-Requires:   perl-BerkeleyDB perl-Mail-DKIM
+Requires:   bzip2
+Requires:   file
+Requires:   gzip
+Requires:   perl-Archive-Tar
+Requires:   perl-Archive-Zip
+Requires:   perl-BerkeleyDB
+Requires:   perl-Compress-Zlib
+Requires:   perl-Convert-TNEF
+Requires:   perl-Convert-UUlib
+Requires:   perl-IO-stringy
+Requires:   perl-MIME-tools
+Requires:   perl-Mail-DKIM
+Requires:   perl-MailTools
+Requires:   perl-Net-Server
+Requires:   perl-Unix-Syslog
+Requires:   perl-spamassassin
+Requires:   sharutils
 Requires:   smtp_daemon
+Requires:   unarj
+Requires:   zoo
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
@@ -136,7 +151,9 @@
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+%if 0%{?suse_version} > 1140
 install -m 644 %{S:5} $RPM_BUILD_ROOT/lib/systemd/system/
+%endif
 install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/
 cd amavisd-milter
 make install DESTDIR="$RPM_BUILD_ROOT"
@@ -187,7 +204,7 @@
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} > 1140
 %config /lib/systemd/system/amavisd.service
 /usr/sbin/amavisd-milter.sh
 %endif

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2012-01-05 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2012-01-05 13:47:40

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2011-11-05 
10:53:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2012-01-05 13:47:44.0 +0100
@@ -1,0 +2,5 @@
+Wed Jan  4 14:47:42 UTC 2012 - vark...@suse.com
+
+- bnc#706257 - amavis failed to start during boot, however it is active
+
+---



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.TtthYc/_old  2012-01-05 13:47:45.0 +0100
+++ /var/tmp/diff_new_pack.TtthYc/_new  2012-01-05 13:47:45.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amavisd-new
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
-Version:2.7.0
-Release:1
 License:GPL-2.0+
 Group:  Productivity/Networking/Security
+Version:2.7.0
+Release:0
 Url:http://www.ijs.si/software/amavisd/
-BuildRequires:  sendmail sendmail-devel
+BuildRequires:  sendmail
+BuildRequires:  sendmail-devel
 Requires:   gzip bzip2 unarj zoo sharutils file
 Requires:   perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy
 Requires:   perl-MIME-tools perl-MailTools perl-Archive-Tar 
perl-Unix-Syslog
@@ -80,7 +79,6 @@
 %package docs
 Summary:Documentation for the High-Performance E-Mail Virus Scanner
 Group:  Documentation/Other
-License:GPL-2.0+
 Recommends: %{name} = %{version}
 
 %description docs

++ rc.amavis ++
--- /var/tmp/diff_new_pack.TtthYc/_old  2012-01-05 13:47:45.0 +0100
+++ /var/tmp/diff_new_pack.TtthYc/_new  2012-01-05 13:47:45.0 +0100
@@ -28,6 +28,38 @@
 AMAVIS_PID=/var/spool/amavis/amavisd.pid
 AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock
 
+# it's like checkproc, but works for scripts too:
+checkproc_script()
+{
+if [ "${1}" = "-p" ]; then
+   if [ -z "${2}" -o -z "${3}" ]; then
+   return 101
+   fi
+   CHECK_PID=`cat "${2}"`;
+   if [ -e /proc/"${CHECK_PID}" ]; then
+   CHECK_EXE="${3}";
+   FOUND=`cat /proc/"${CHECK_PID}"/cmdline | grep "${CHECK_EXE}"`
+   if [ -n "${FOUND}" ]; then
+   return 0;
+   else
+   return 1;
+   fi
+   else
+   return 3;
+   fi
+elif [ -z "${2}" ]; then
+   CHECK_EXE="${1}";
+   FOUND=`ps auxwww | grep "${CHECK_EXE}"`
+   if [ -n "${FOUND}" ]; then
+   return 0;
+   else
+   return 7;
+   fi
+fi
+
+return 101;
+}
+
 # Check for missing binaries (stale symlinks should not happen)
 # Note: Special treatment of stop for LSB conformance
 test -x $AMAVISD_BIN || { echo "$AMAVIS_BIN not installed";
@@ -60,7 +92,7 @@
 start)
# ZMI 20100428 check for stale pid file
if test -f $AMAVIS_PID ; then
-   checkproc -p $AMAVIS_PID amavisd
+   checkproc_script -p $AMAVIS_PID $AMAVISD_BIN
if test $? -ge 1 ; then
# pid file is stale, remove it
echo -n "(stale amavisd pid file $AMAVIS_PID found, 
removing. Did amavisd crash?)"
@@ -69,7 +101,7 @@
fi
 echo -n "Starting virus-scanner (amavisd-new): "
 $AMAVISD_BIN start
-if ! checkproc amavisd; then
+   if ! checkproc_script $AMAVISD_BIN; then
 rc_failed 7
 fi
 rc_status -v
@@ -82,7 +114,7 @@
;;
 stop)
 echo -n "Shutting down virus-scanner (amavisd-new): "
-if checkproc amavisd; then
+if checkproc_script $AMAVISD_BIN; then
 rc_reset
 $AMAVISD_BIN stop
 else
@@ -117,12 +149,12 @@
 ;; 
 status)
 echo -n "Checking for service amavis (amavisd-new): "
-checkproc -p $AMAVIS_PID amavisd
+checkproc_script -p $AMAVIS_PID $AMAVISD_BIN
 rc_status -v
 if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
 rc_r

commit amavisd-new for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2011-12-06 17:58:21

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.vXizRx/_old  2011-12-06 17:58:35.0 +0100
+++ /var/tmp/diff_new_pack.vXizRx/_new  2011-12-06 17:58:35.0 +0100
@@ -21,7 +21,7 @@
 Summary:High-Performance E-Mail Virus Scanner
 Version:2.7.0
 Release:1
-License:GPLv2+
+License:GPL-2.0+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
 BuildRequires:  sendmail sendmail-devel
@@ -80,7 +80,7 @@
 %package docs
 Summary:Documentation for the High-Performance E-Mail Virus Scanner
 Group:  Documentation/Other
-License:GPLv2+
+License:GPL-2.0+
 Recommends: %{name} = %{version}
 
 %description docs

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-11-05 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2011-11-05 10:53:41

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2011-11-02 
11:42:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2011-11-05 10:53:45.0 +0100
@@ -1,0 +2,5 @@
+Fri Nov  4 06:23:56 UTC 2011 - vark...@suse.com
+
+- Add systemd scripts 
+
+---

New:

  amavisd-milter.sh
  amavisd.service



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.DLQFUN/_old  2011-11-05 11:00:16.0 +0100
+++ /var/tmp/diff_new_pack.DLQFUN/_new  2011-11-05 11:00:16.0 +0100
@@ -34,6 +34,10 @@
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
+%if 0%{?suse_version} > 1140
+BuildRequires:  systemd
+%{?systemd_requires}
+%endif
 Recommends: unrar
 Recommends: clamav perl-spamassassin
 Recommends: perl-DBI
@@ -51,6 +55,8 @@
 Source2:rc.amavis
 Source3:amavisd-new-rpmlintrc
 Source4:amavisd-milter.tar.bz2
+Source5:amavisd.service
+Source6:amavisd-milter.sh
 Patch1: activate_virus_scanner.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define avspool/var/spool/amavis
@@ -131,6 +137,9 @@
 ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+install -m 644 %{S:5} $RPM_BUILD_ROOT/lib/systemd/system/
+install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/
 cd amavisd-milter
 make install DESTDIR="$RPM_BUILD_ROOT"
 
@@ -180,6 +189,10 @@
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
+%if 0%{?suse_version} >= 1140
+%config /lib/systemd/system/amavisd.service
+/usr/sbin/amavisd-milter.sh
+%endif
 %defattr(0750,%{avuser},%{avgroup})
 %dir %{avspool}
 %dir %{avspool}/tmp

++ amavisd-milter.sh ++
#!/bin/bash

. /etc/sysconfig/amavis
AMAVIS_MILTER_BIN=/usr/sbin/amavisd-milter
AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock

case "$1" in
start)
if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then
startproc -u vscan $AMAVIS_MILTER_BIN -p $AMAVIS_MILTER_SOCK > 
/dev/null 2>&1
fi
;;
stop)
if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then
killproc -TERM $AMAVIS_MILTER_BIN
fi
;;
esac
exit 0
++ amavisd.service ++
# This file is part of package amavisd.
#
# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback
#
# Description:
#
#  Used to start the amavisd
#   Amavisd-new is a high-performance interface between mailer (MTA) and
#   content checkers: virus scanners or SpamAssassin. It talks to the MTA
#   via (E)SMTP, LMTP, or by using helper programs.
#

[Unit]
Description=Amavisd-new Virus Scanner interfac
Requires=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
After=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
Wants=named.service clamd.service
After=named.service clamd.service
Before=mail-transfer-agent.target
Conflicts=

[Service]
Type=forking
PIDFile=/var/spool/amavis/amavisd.pid
ExecStartPre=-/bin/echo 'Starting virus-scanner (amavisd-new):'
EnvironmentFile=-/etc/sysconfig/amavisd
ExecStartPre=/usr/sbin/amavisd-milter.sh start
ExecStart=/usr/sbin/amavisd start
ExecStartPost=
ExecStartPost=
ExecReload=/usr/sbin/postfix reload
ExecReload=/usr/sbin/postfix flush
ExecStop=/usr/sbin/amavisd stop
ExecStopPost=/usr/sbin/amavisd-milter.sh stop

[Install]
WantedBy=multi-user.target
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-11-02 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2011-11-02 11:42:11

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2011-10-27 
13:53:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2011-11-02 11:42:12.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov  2 10:05:41 UTC 2011 - vark...@suse.com
+
+- Fix amavisd-milter binary name 
+
+---



Other differences:
--
++ rc.amavis ++
--- /var/tmp/diff_new_pack.SCTMMq/_old  2011-11-02 11:42:13.0 +0100
+++ /var/tmp/diff_new_pack.SCTMMq/_new  2011-11-02 11:42:13.0 +0100
@@ -22,7 +22,7 @@
 ### END INIT INFO
 
 AMAVISD_BIN=/usr/sbin/amavisd
-AMAVIS_MILTER_BIN=/usr/sbin/amavis-milter
+AMAVIS_MILTER_BIN=/usr/sbin/amavisd-milter
 AMAVIS_SYSCONFIG=/etc/sysconfig/amavis
 AMAVIS_CONF=/etc/amavisd.conf
 AMAVIS_PID=/var/spool/amavis/amavisd.pid

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-10-27 Thread h_root
Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory 
checked in at 2011-10-27 13:47:09

Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old)
 and  /work/SRC/openSUSE:Factory/.amavisd-new.new (New)


Package is "amavisd-new", Maintainer is "vark...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes  2011-10-11 
17:15:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 
2011-10-27 13:53:17.0 +0200
@@ -1,0 +2,10 @@
+Wed Oct 26 08:58:10 UTC 2011 - w...@rosenauer.org
+
+- obsolete amavisd-milter package
+
+---
+Thu Oct 13 13:11:20 UTC 2011 - vark...@suse.com
+
+- Integrate amavisd-milter 
+
+---

New:

  amavisd-milter.tar.bz2



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.k556dw/_old  2011-10-27 13:53:19.0 +0200
+++ /var/tmp/diff_new_pack.k556dw/_new  2011-10-27 13:53:19.0 +0200
@@ -31,7 +31,6 @@
 Requires:   perl-Convert-TNEF perl-Archive-Zip perl-Net-Server 
perl-spamassassin
 Requires:   perl-BerkeleyDB perl-Mail-DKIM
 Requires:   smtp_daemon
-Requires:   amavisd-milter
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
@@ -42,13 +41,16 @@
 Recommends: perl-Authen-SASL
 Recommends: perl-Mail-ClamAV
 Recommends: %{name}-docs = %{version}
+Provides:   amavisd-milter = 1.5.0
+Obsoletes:  amavisd-milter <= 1.5.0
 PreReq: coreutils net-tools sed pwdutils
 PreReq: %insserv_prereq
 PreReq: util-linux
 Source0:amavisd-new.tar.bz2
 Source1:sysconfig.amavis
 Source2:rc.amavis
-Source5:amavisd-new-rpmlintrc
+Source3:amavisd-new-rpmlintrc
+Source4:amavisd-milter.tar.bz2
 Patch1: activate_virus_scanner.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define avspool/var/spool/amavis
@@ -65,11 +67,10 @@
 following MTAs:
 
 - postfix
-
 - sendmail (sendmail-milter)
-
 - exim
 
+
 %package docs
 Summary:Documentation for the High-Performance E-Mail Virus Scanner
 Group:  Documentation/Other
@@ -84,11 +85,13 @@
 This package contains the documentation and Relase-Notes.
 
 %prep
-%setup -q
+%setup -q -a 4
 %patch1
-for i in $(ls amavisd*); do
+for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do
+if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *spec ]] ; then continue; fi
+if [[ $i == amavisd-milter ]] ; then continue; fi
 sed -i "s|\$daemon_user  = 'vscan';|\$daemon_user  = '%{avuser}';|g; \
 s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \
 s|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \
@@ -97,9 +100,14 @@
 s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \
 s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i
 done
+
 # ---
 
 %build
+cd amavisd-milter
+%configure --localstatedir="/var/spool/amavis"
+make
+
 # ---
 
 %install
@@ -123,6 +131,8 @@
 ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
+cd amavisd-milter
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 %pre
 /usr/sbin/groupadd -r %{avgroup} 2> /dev/null || :
@@ -178,12 +188,13 @@
 %dir %{avquarantine}
 
 %files docs
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %doc RELEASE_NOTES
 %doc README_FILES
 %doc test-messages
 %doc amavisd.conf-*
 %doc MANIFEST TODO 
 %doc test-messages
+%doc %{_mandir}/man8/amavisd-milter*
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-10-11 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Tue Oct 11 17:15:57 CEST 2011.




--- openSUSE:Factory/amavisd-new/amavisd-new.changes2011-09-23 
01:51:44.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-10-11 16:23:23.0 +0200
@@ -1,0 +2,5 @@
+Tue Oct 11 14:22:57 UTC 2011 - vark...@suse.com
+
+- bnc#718025 - amavisd-new 2.7.0 fails to start 
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.hT0Z3d/_old  2011-10-11 17:15:46.0 +0200
+++ /var/tmp/diff_new_pack.hT0Z3d/_new  2011-10-11 17:15:46.0 +0200
@@ -31,6 +31,7 @@
 Requires:   perl-Convert-TNEF perl-Archive-Zip perl-Net-Server 
perl-spamassassin
 Requires:   perl-BerkeleyDB perl-Mail-DKIM
 Requires:   smtp_daemon
+Requires:   amavisd-milter
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-09-22 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Thu Sep 22 10:39:57 CEST 2011.




--- amavisd-new/amavisd-new.changes 2011-09-14 12:57:26.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-09-17 13:02:08.0 +0200
@@ -1,0 +2,5 @@
+Sat Sep 17 11:02:03 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.DDxDBr/_old  2011-09-22 10:39:52.0 +0200
+++ /var/tmp/diff_new_pack.DDxDBr/_new  2011-09-22 10:39:52.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:   amavisd-new
@@ -70,12 +69,6 @@
 
 - exim
 
-
-
-Authors:
-
-Mark Martinec 
-
 %package docs
 Summary:Documentation for the High-Performance E-Mail Virus Scanner
 Group:  Documentation/Other
@@ -89,12 +82,6 @@
 
 This package contains the documentation and Relase-Notes.
 
-
-
-Authors:
-
-Mark Martinec 
-
 %prep
 %setup -q
 %patch1
@@ -169,9 +156,6 @@
 %restart_on_update amavis
 %{insserv_cleanup}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc AAAREADME.first LICENSE INSTALL 






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-09-14 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Wed Sep 14 13:56:14 CEST 2011.




--- amavisd-new/amavisd-new.changes 2011-08-30 17:23:18.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-09-14 12:57:26.0 +0200
@@ -1,0 +2,32 @@
+Tue Sep 13 13:24:37 UTC 2011 - vark...@suse.com
+
+- update to 2.7.0 With a synergy of four solutions, using amavisd-new
+  in a pre-queue filtering setup became a sensible / better behaved solution:
+
+  - old helper programs amavis.c and amavis-milter.c are no longer distributed
+with the package, along with the whole helper-progs subdirectory.
+As a milter client please use the more modern 'amavisd-milter' package by
+Petr Rehor, available at http://sourceforge.net/projects/amavisd-milter/
+
+  - the "smtpd_proxy_options=speed_adjust" Postfix option, available since
+Postfix 2.7.0 (20091101), improves decoupling between SMTP clients
+and a content filter in a proxy setup, reducing the number of content
+filtering processes needed for the same mail load. With this option
+turned on, a Postfix SMTP server receives the entire message before
+connecting to a before-queue content filter;
+  
+  - a master_deadline option and its API equivalent, available in SpamAssassin
+since version 3.3.0, allows for time limiting on lengthy rules checking,
+while still providing results when a time limit is exceeded; this makes
+it more suitable for time-sensitive setups like a pre-queue filtering 
setup;
+  
+  - reworked sub-task time limiting in amavisd, along with its counterpart
+solution in SpamAssassin, makes it better suited to a real-time nature
+of pre-queue filtering setups, where one has no control over how long
+SMTP clients are willing to wait at the data-end stage;
+  
+  - a re-purposed command line option 'reload' now does a warm restart,
+keeping sockets available to an MTA client at all times, thus reducing
+a chance that an MTA would even notice a content filter's warm restart.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.ctAb7V/_old  2011-09-14 13:56:10.0 +0200
+++ /var/tmp/diff_new_pack.ctAb7V/_new  2011-09-14 13:56:10.0 +0200
@@ -20,8 +20,8 @@
 
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
-Version:2.6.6
-Release:16
+Version:2.7.0
+Release:1
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
@@ -61,7 +61,7 @@
 %description
 Amavisd-new is a high-performance interface between mailer (MTA) and
 content checkers: virus scanners or SpamAssassin. It talks to the MTA
-via (E)SMTP, LMTP, or by using helper programs. It works with the
+via (E)SMTP, LMTP. It works with the
 following MTAs:
 
 - postfix
@@ -85,7 +85,7 @@
 %description docs
 Amavisd-new is a high-performance interface between mailer (MTA) and
 content checkers: virus scanners or SpamAssassin. It talks to the MTA
-via (E)SMTP, LMTP, or by using helper programs.
+via (E)SMTP, LMTP.
 
 This package contains the documentation and Relase-Notes.
 
@@ -112,12 +112,6 @@
 # ---
 
 %build
-cd helper-progs
-%configure  --with-user=%{avuser} \
---with-runtime-dir=%{avspool} \
-   --with-sockname=%{avspool}/amavisd.sock \
-   --with-milterlib=%{_libdir}
-make %{?jobs:-j%jobs}
 # ---
 
 %install
@@ -139,11 +133,8 @@
 install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf
 install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis
 ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
-install -m 755 helper-progs/amavis $RPM_BUILD_ROOT/%{_sbindir}/amavis
-install -m 755 helper-progs/amavis-milter 
$RPM_BUILD_ROOT/%{_sbindir}/amavis-milter
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
-echo "d /var/run/amavis 0750 %{avuser} %{avgroup} -" > 
$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/amavis-milter.conf
 
 %pre
 /usr/sbin/groupadd -r %{avgroup} 2> /dev/null || :
@@ -191,7 +182,6 @@
 %config /etc/init.d/amavis
 %config(noreplace) /etc/amavisd.conf
 %config(noreplace) /etc/openldap/schema/amavisd-new.schema
-%config(noreplace) /usr/lib/tmpfiles.d/amavis-milter.conf
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm

++ activate_virus_scanner.diff ++
--- /var/tmp/diff_new_pack.ctAb7V/_old  2011-09-14 13:56:10.0 +

commit amavisd-new for openSUSE:Factory

2011-09-02 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Fri Sep 2 09:41:25 CEST 2011.




--- amavisd-new/amavisd-new.changes 2011-07-12 18:04:32.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-08-30 17:23:18.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 30 15:22:40 UTC 2011 - vark...@suse.com
+
+- bnc#710289 - amavisd-new: fails rpmlint check non-ghost-in-var-run 
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.evKnNM/_old  2011-09-02 09:37:17.0 +0200
+++ /var/tmp/diff_new_pack.evKnNM/_new  2011-09-02 09:37:17.0 +0200
@@ -21,7 +21,7 @@
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
 Version:2.6.6
-Release:14
+Release:16
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
@@ -54,7 +54,6 @@
 %define avspool/var/spool/amavis
 %define avdb   /var/spool/amavis/db
 %define avquarantine   /var/spool/amavis/virusmails
-%define miltersockdir  /var/run/amavis
 %define logmsg logger -t %{name}/rpm
 %define avuser vscan
 %define avgroupvscan
@@ -129,8 +128,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
-mkdir -p $RPM_BUILD_ROOT/%{miltersockdir}
 mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis 
$RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd
 install -m 755 amavisd-agent $RPM_BUILD_ROOT/%{_sbindir}/amavisd-agent
@@ -144,6 +143,7 @@
 install -m 755 helper-progs/amavis-milter 
$RPM_BUILD_ROOT/%{_sbindir}/amavis-milter
 install -m 644 LDAP.schema 
$RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
 install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
+echo "d /var/run/amavis 0750 %{avuser} %{avgroup} -" > 
$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/amavis-milter.conf
 
 %pre
 /usr/sbin/groupadd -r %{avgroup} 2> /dev/null || :
@@ -187,9 +187,11 @@
 %doc LDAP.ldif
 %dir /etc/openldap
 %dir /etc/openldap/schema
+%dir /usr/lib/tmpfiles.d
 %config /etc/init.d/amavis
 %config(noreplace) /etc/amavisd.conf
 %config(noreplace) /etc/openldap/schema/amavisd-new.schema
+%config(noreplace) /usr/lib/tmpfiles.d/amavis-milter.conf
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
@@ -199,7 +201,6 @@
 %dir %{avspool}/db
 %dir %{avspool}/var
 %dir %{avquarantine}
-%dir %{miltersockdir}
 
 %files docs
 %defattr(-,root,root)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-07-13 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Wed Jul 13 12:13:56 CEST 2011.




--- amavisd-new/amavisd-new.changes 2011-05-24 10:11:04.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-07-12 18:04:32.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 12 16:02:45 UTC 2011 - vark...@novell.com
+
+- Enable clamav as integrated scanner
+- Enable Avira Antivir personal
+
+---

calling whatdependson for head-i586


New:

  activate_virus_scanner.diff



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.wDR5P4/_old  2011-07-13 10:54:27.0 +0200
+++ /var/tmp/diff_new_pack.wDR5P4/_new  2011-07-13 10:54:27.0 +0200
@@ -21,7 +21,7 @@
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
 Version:2.6.6
-Release:1
+Release:14
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
@@ -49,6 +49,7 @@
 Source1:sysconfig.amavis
 Source2:rc.amavis
 Source5:amavisd-new-rpmlintrc
+Patch1: activate_virus_scanner.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define avspool/var/spool/amavis
 %define avdb   /var/spool/amavis/db
@@ -97,6 +98,7 @@
 
 %prep
 %setup -q
+%patch1
 for i in $(ls amavisd*); do
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *spec ]] ; then continue; fi

++ activate_virus_scanner.diff ++
--- amavisd.conf2011-05-13 19:25:52.0 +0200
+++ amavisd.conf2011-07-12 17:39:15.382622002 +0200
@@ -350,6 +350,12 @@
 
 @av_scanners = (
 
+### Avira for UNIX 3.x
+## from http://forum.avira.com/wbb/index.php?page=Thread&postID=812607 ###
+['Avira AntiVir', ['avscan'],
+  '-s --batch --alert-action=none {}', [0], qr/(?:ALERT|FUND):/m,
+  qr/(?:ALERT|FUND): (.[^;]+) ;/m ],
+
 # ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/)
 # ['Sophie',
 #   \&ask_daemon, ["{}/\n", '/var/run/sophie'],
@@ -360,10 +366,10 @@
 # ['Sophos SAVI', \&sophos_savi ],
 
 # ### http://www.clamav.net/
-# ['ClamAV-clamd',
-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-#   qr/\bOK$/m, qr/\bFOUND$/m,
-#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+ ['ClamAV-clamd',
+   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
+   qr/\bOK$/m, qr/\bFOUND$/m,
+   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 # # NOTE: run clamd under the same user as amavisd, or run it under its own
 # #   uid such as clamav, add user clamav to the amavis group, and then add
 # #   AllowSupplementaryGroups to clamd.conf;





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-05-24 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Tue May 24 14:34:46 CEST 2011.




--- amavisd-new/amavisd-new.changes 2011-02-21 18:57:59.0 +0100
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-05-24 10:11:04.0 +0200
@@ -1,0 +2,24 @@
+Tue May 24 08:02:50 UTC 2011 - vark...@suse.de
+
+- update to 2.6.6
+ - amavisd-release was not sending a 'mail_file' attribute when a quarantined
+  message was a non-compressed file in a single-level directory quarantine
+
+- quarantining to SQL was sporadically failing, reporting some unrelated
+  random error (like 'not available' or 'OpenSSL error: header too long');
+
+- avoid a warning "_WARN: Use of uninitialized value in string eq at ...
+  line 275." when an SQL-based white/black-listing is used;
+
+- wrap the sql clause  SET NAMES 'utf8'  so that only a warning at
+  a log level 2 is issued if an SQL server does not understand the
+  command (SQLite, old versions of MySQL) instead of aborting;
+ 
+- when a back-end MTA rejected a message, amavisd would send a non-delivery
+  status notification, but also propagate the reject status back, which is
+  wrong, only one or the other response would be appropriate. A fix also
+  allows choosing either a D_REJECT, D_BOUNCE or D_DISCARD response for
+  such a case, configurable through %final_destiny_by_ccat at a CC_MTA
+  entry, defaulting to D_REJECT;
+
+---

calling whatdependson for head-i586


Old:

  RELEASE_NOTES.tar.bz2
  bnc#521366.diff



Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.VIV27X/_old  2011-05-24 14:32:56.0 +0200
+++ /var/tmp/diff_new_pack.VIV27X/_new  2011-05-24 14:32:56.0 +0200
@@ -20,8 +20,8 @@
 
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
-Version:2.6.4
-Release:12
+Version:2.6.6
+Release:1
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
@@ -48,9 +48,7 @@
 Source0:amavisd-new.tar.bz2
 Source1:sysconfig.amavis
 Source2:rc.amavis
-Source4:RELEASE_NOTES.tar.bz2
 Source5:amavisd-new-rpmlintrc
-Patch1: bnc#521366.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define avspool/var/spool/amavis
 %define avdb   /var/spool/amavis/db
@@ -98,7 +96,7 @@
 Mark Martinec 
 
 %prep
-%setup -q -a4 
+%setup -q
 for i in $(ls amavisd*); do
 if [[ $i == *patch ]] ; then continue; fi
 if [[ $i == *spec ]] ; then continue; fi
@@ -110,7 +108,6 @@
 s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \
 s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i
 done
-%patch1
 # ---
 
 %build
@@ -204,7 +201,7 @@
 
 %files docs
 %defattr(-,root,root)
-%doc RELEASE_NOTES*
+%doc RELEASE_NOTES
 %doc README_FILES
 %doc test-messages
 %doc amavisd.conf-*

++ amavisd-new.tar.bz2 ++
 3375 lines of diff (skipped)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-02-21 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Tue Feb 22 00:00:07 CET 2011.




--- amavisd-new/amavisd-new.changes 2011-02-20 11:41:56.0 +0100
+++ amavisd-new/amavisd-new.changes 2011-02-21 18:57:59.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 21 18:57:25 UTC 2011 - vark...@novell.com
+
+- bnc#663726 - amavisd-new: group of /var/spool/amavis conflicts with av 
programms 
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.XkG27Z/_old  2011-02-21 23:59:26.0 +0100
+++ /var/tmp/diff_new_pack.XkG27Z/_new  2011-02-21 23:59:26.0 +0100
@@ -21,7 +21,7 @@
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
 Version:2.6.4
-Release:11
+Release:12
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
@@ -194,7 +194,7 @@
 /var/adm/fillup-templates/sysconfig.amavis
 %{_sbindir}/*
 %{perl_vendorlib}/JpegTester.pm
-%defattr(0700,%{avuser},root)
+%defattr(0750,%{avuser},%{avgroup})
 %dir %{avspool}
 %dir %{avspool}/tmp
 %dir %{avspool}/db






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit amavisd-new for openSUSE:Factory

2011-02-20 Thread h_root

Hello community,

here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Mon Feb 21 00:17:13 CET 2011.




--- amavisd-new/amavisd-new.changes 2010-06-24 12:19:53.0 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes
2011-02-20 11:41:56.0 +0100
@@ -1,0 +2,5 @@
+Sun Feb 20 10:41:40 UTC 2011 - co...@novell.com
+
+- unrar should not be required (non-free software now)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ amavisd-new.spec ++
--- /var/tmp/diff_new_pack.70qvwl/_old  2011-02-21 00:16:59.0 +0100
+++ /var/tmp/diff_new_pack.70qvwl/_new  2011-02-21 00:16:59.0 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package amavisd-new (Version 2.6.4)
+# spec file for package amavisd-new
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,12 +21,12 @@
 Name:   amavisd-new
 Summary:High-Performance E-Mail Virus Scanner
 Version:2.6.4
-Release:3
+Release:11
 License:GPLv2+
 Group:  Productivity/Networking/Security
 Url:http://www.ijs.si/software/amavisd/
 BuildRequires:  sendmail sendmail-devel
-Requires:   gzip bzip2 unarj unrar zoo sharutils file
+Requires:   gzip bzip2 unarj zoo sharutils file
 Requires:   perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy
 Requires:   perl-MIME-tools perl-MailTools perl-Archive-Tar 
perl-Unix-Syslog
 Requires:   perl-Convert-TNEF perl-Archive-Zip perl-Net-Server 
perl-spamassassin
@@ -35,6 +35,7 @@
 %if 0%{?suse_version} < 1120
 Requires:   lha
 %endif
+Recommends: unrar
 Recommends: clamav perl-spamassassin 
 Recommends: perl-DBI
 Recommends: perl-ldap






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org