[amavisd-new/el6: 5/5] Merge remote branch 'origin/master' into el6
by Robert Scheck
commit a9e6ff24bc138d4e312bc76080552d004b04201c
Merge: f79ab9a 30edeb1
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Mon Dec 2 16:30:56 2013 +0100
Merge remote branch 'origin/master' into el6
amavisd-conf.patch | 14 +++++++++++++-
amavisd-new-2.8.0-init_network.patch | 13 +++++++++++++
amavisd-new.spec | 21 ++++++++++++++++++++-
3 files changed, 46 insertions(+), 2 deletions(-)
---
10 years, 6 months
[amavisd-new] - Commented ripole(1) decoder as the binary is not packaged - Commented tnef(1) decoder as the perl
by Robert Scheck
commit 30edeb10d4e25c8950cefe9acee3855a83350ade
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Mon Dec 2 16:28:13 2013 +0100
- Commented ripole(1) decoder as the binary is not packaged
- Commented tnef(1) decoder as the perl module is a dependency
amavisd-conf.patch | 14 +++++++++++++-
amavisd-new.spec | 6 +++++-
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/amavisd-conf.patch b/amavisd-conf.patch
index 0143277..ef1b7a1 100644
--- a/amavisd-conf.patch
+++ b/amavisd-conf.patch
@@ -1,5 +1,5 @@
--- amavisd-new-2.8.0/amavisd.conf 2012-06-30 23:33:32.000000000 +0200
-+++ amavisd-new-2.8.0/amavisd.conf.conf 2012-07-05 22:14:48.000000000 +0200
++++ amavisd-new-2.8.0/amavisd.conf.conf 2013-12-02 16:24:05.000000000 +0100
@@ -14,25 +14,25 @@
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
@@ -64,6 +64,18 @@
# $bad_header_quarantine_method = undef;
# $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
+@@ -335,9 +335,9 @@
+ ['arj', \&do_unarj, ['unarj', 'arj'] ],
+ ['arc', \&do_arc, ['nomarch', 'arc'] ],
+ ['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
+- ['doc', \&do_ole, 'ripole'],
++# ['doc', \&do_ole, 'ripole'], # no ripole package so far
+ ['cab', \&do_cabextract, 'cabextract'],
+- ['tnef', \&do_tnef_ext, 'tnef'],
++# ['tnef', \&do_tnef_ext, 'tnef'], # use internal do_tnef() instead
+ ['tnef', \&do_tnef],
+ # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
+ # ['sit', \&do_unstuff, 'unstuff'], # not safe
@@ -375,16 +375,16 @@
# qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
# settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 1a1a435..491f45a 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.8.0
-Release: 7%{?prerelease:.%{prerelease}}%{?dist}
+Release: 8%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -227,6 +227,10 @@ fi
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Mon Dec 02 2013 Robert Scheck <robert(a)fedoraproject.org> 2.8.0-8
+- Commented ripole(1) decoder as the binary is not packaged
+- Commented tnef(1) decoder as the perl module is a dependency
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 6 months
[perl-PAR-Packer/f18] 1.016 bump
by Petr Pisar
commit 523a92f8d090ba222969767bd126548a675aa40c
Author: Petr Písař <ppisar(a)redhat.com>
Date: Mon Dec 2 13:58:51 2013 +0100
1.016 bump
.gitignore | 1 +
perl-PAR-Packer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74eb807..45594e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ PAR-Packer-1.005.tar.gz
/PAR-Packer-1.013.tar.gz
/PAR-Packer-1.014.tar.gz
/PAR-Packer-1.015.tar.gz
+/PAR-Packer-1.016.tar.gz
diff --git a/perl-PAR-Packer.spec b/perl-PAR-Packer.spec
index f3c3cab..a98f101 100644
--- a/perl-PAR-Packer.spec
+++ b/perl-PAR-Packer.spec
@@ -1,5 +1,5 @@
Name: perl-PAR-Packer
-Version: 1.015
+Version: 1.016
Release: 1%{?dist}
Summary: PAR Packager
License: GPL+ or Artistic
@@ -130,6 +130,9 @@ fi
%{_datadir}/icons/hicolor/32x32/apps/tkpp.gif
%changelog
+* Mon Dec 02 2013 Petr Pisar <ppisar(a)redhat.com> - 1.016-1
+- 1.016 bump
+
* Fri Oct 11 2013 Petr Šabata <contyk(a)redhat.com> - 1.015-1
- 1.015 bugfix bump
diff --git a/sources b/sources
index bfffc1b..17fd2ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-851253c166c746d4c3968beaca5c49bc PAR-Packer-1.015.tar.gz
+026f95929661b653ff414ffd7c5c3040 PAR-Packer-1.016.tar.gz
10 years, 6 months
[perl-PAR-Packer/f19] 1.016 bump
by Petr Pisar
Summary of changes:
db3e05b... 1.016 bump (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
[perl-PAR-Packer/f20] 1.016 bump
by Petr Pisar
Summary of changes:
db3e05b... 1.016 bump (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
[perl-PAR-Packer] 1.016 bump
by Petr Pisar
commit db3e05b292a8a77ba434371a215fdd9bff7ae9aa
Author: Petr Písař <ppisar(a)redhat.com>
Date: Mon Dec 2 13:58:51 2013 +0100
1.016 bump
.gitignore | 1 +
perl-PAR-Packer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74eb807..45594e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ PAR-Packer-1.005.tar.gz
/PAR-Packer-1.013.tar.gz
/PAR-Packer-1.014.tar.gz
/PAR-Packer-1.015.tar.gz
+/PAR-Packer-1.016.tar.gz
diff --git a/perl-PAR-Packer.spec b/perl-PAR-Packer.spec
index b2e3633..33d0d4c 100644
--- a/perl-PAR-Packer.spec
+++ b/perl-PAR-Packer.spec
@@ -1,5 +1,5 @@
Name: perl-PAR-Packer
-Version: 1.015
+Version: 1.016
Release: 1%{?dist}
Summary: PAR Packager
License: GPL+ or Artistic
@@ -130,6 +130,9 @@ fi
%{_datadir}/icons/hicolor/32x32/apps/tkpp.gif
%changelog
+* Mon Dec 02 2013 Petr Pisar <ppisar(a)redhat.com> - 1.016-1
+- 1.016 bump
+
* Fri Oct 11 2013 Petr Šabata <contyk(a)redhat.com> - 1.015-1
- 1.015 bugfix bump
diff --git a/sources b/sources
index bfffc1b..17fd2ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-851253c166c746d4c3968beaca5c49bc PAR-Packer-1.015.tar.gz
+026f95929661b653ff414ffd7c5c3040 PAR-Packer-1.016.tar.gz
10 years, 6 months