update to 3.0.1

This commit is contained in:
root 2021-01-25 19:40:54 +08:00
parent 1299561d39
commit fc1c8d4ad0
8 changed files with 9 additions and 125 deletions

View File

@ -1,47 +0,0 @@
From 1186c36c44ca581fd4819f59d1823d3f2ec17164 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@brianlane.com>
Date: Wed, 8 Aug 2018 13:06:58 -0700
Subject: [PATCH] Fix SIGSEGV in reformime (#1613761)
Check for NULL section when running strtok on it for decode and
do_extract handling.
---
libs/rfc2045/reformime.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libs/rfc2045/reformime.c b/libs/rfc2045/reformime.c
index 9851c65..49a0ebd 100644
--- a/libs/rfc2045/reformime.c
+++ b/libs/rfc2045/reformime.c
@@ -1164,10 +1164,11 @@ int rc=0;
}
else if (dodecode)
{
- mimesection = strtok(section,",");
+ mimesection = section ? strtok(section, ","):NULL;
do {
print_decode(p, mimesection);
- mimesection = strtok(NULL,",");
+ if (mimesection)
+ mimesection = strtok(NULL,",");
} while (mimesection != NULL);
}
else if (dorewrite)
@@ -1176,11 +1177,12 @@ int rc=0;
dsn(p, dodsn == 2);
else if (do_extract)
{
- mimesection = strtok(section,",");
+ mimesection = section ? strtok(section, ","):NULL;
do {
extract_section(p, mimesection, extract_filename,
argc-argn, argv+argn, do_extract);
- mimesection = strtok(NULL,",");
+ if (mimesection)
+ mimesection = strtok(NULL,",");
} while (mimesection != NULL);
}
else if (dovalidate)
--
2.17.1

View File

@ -1,36 +0,0 @@
# maildrop
#### Description
Mail delivery agent with filtering abilities
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -1,37 +0,0 @@
# maildrop
#### 介绍
Mail delivery agent with filtering abilities
#### 软件架构
软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
#### 参与贡献
1. Fork 本仓库
2. 新建 Feat_xxx 分支
3. 提交代码
4. 新建 Pull Request
#### 特技
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

Binary file not shown.

Binary file not shown.

BIN
maildrop-3.0.1.tar.bz2 Normal file

Binary file not shown.

BIN
maildrop-3.0.1.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,17 +1,17 @@
%global _hardened_build 1
Summary: Mail delivery agent with filtering abilities
Name: maildrop
Version: 2.9.3
Version: 3.0.1
Release: 1
License: GPLv2 with exceptions
URL: https://sourceforge.net/projects/courier
Source0: https://downloads.sourceforge.net/project/courier/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1: https://downloads.sourceforge.net/project/courier/%{name}/%{version}/%{name}-%{version}.tar.bz2.sig
Source2: pubkey.maildrop
Patch0001: 0001-Fix-SIGSEGV-in-reformime-1613761.patch
Requires: courier-unicode >= 1.4
Requires: courier-unicode >= 2.1
BuildRequires: automake, libtool, autoconf gcc-c++, gdbm-devel, libdb-devel, pcre-devel gawk
BuildRequires: gnupg courier-unicode-devel >= 1.4 gamin-devel
BuildRequires: gnupg courier-unicode-devel >= 2.1 libidn-devel gamin-devel
%description
maildrop is the mail filter/mail delivery agent that's used by the
Courier Mail Server. This is a standalone build of the maildrop mail
@ -47,7 +47,8 @@ gpg --verify %{SOURCE1} %{SOURCE0}
--enable-use-dotlock=1 \
--enable-syslog=1 \
--enable-sendmail=%{_sbindir}/sendmail
make
%make_build
%install
rm -rf %{buildroot}
@ -73,5 +74,8 @@ cp -pr README README.postfix ChangeLog UPGRADE %{buildroot}%{_defaultdocdir}/%{n
%{_mandir}/man8/*.8*
%changelog
* Mon Jan 25 2021 orange-snn <songnannan2@huawei.com> - 3.0.1-1
- update to 3.0.1
* Wed Oct 14 2020 chengzihan <chengzihan2@huawei.com> - 2.9.3-1
- Package init