From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 26 Sep 2021 21:40:32 +0000 (+0200)
Subject: - up to 3.6.2
X-Git-Tag: auto/th/postfix-3.6.2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpostfix.git;a=commitdiff_plain;h=d8280ba

- up to 3.6.2
---

diff --git a/glibc-2.34.patch b/glibc-2.34.patch
new file mode 100644
index 0000000..4ab1422
--- /dev/null
+++ b/glibc-2.34.patch
@@ -0,0 +1,10 @@
+--- postfix-3.5.11/src/util/sys_defs.h~	2021-09-26 23:25:46.000000000 +0200
++++ postfix-3.5.11/src/util/sys_defs.h	2021-09-26 23:32:57.661271117 +0200
+@@ -774,6 +774,7 @@
+ #define PREPEND_PLUS_TO_OPTSTRING
+ #define HAS_POSIX_REGEXP
+ #define HAS_DLOPEN
++#define HAS_CLOSEFROM
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+ #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
diff --git a/postfix-scache_clnt.patch b/postfix-scache_clnt.patch
index e34ee5e..27532ea 100644
--- a/postfix-scache_clnt.patch
+++ b/postfix-scache_clnt.patch
@@ -4,8 +4,8 @@
      sp->scache->size = scache_clnt_size;
      sp->scache->free = scache_clnt_free;
  
--    service = concatenate("local:private/", server, (char *) 0);
-+    service = concatenate("local:private/", var_scache_service, (char *) 0);
+-    service = concatenate("local:" MAIL_CLASS_PRIVATE "/", server, (char *) 0);
++    service = concatenate("local:" MAIL_CLASS_PRIVATE "/", var_scache_service, (char *) 0);
      sp->auto_clnt = auto_clnt_create(service, timeout, idle_limit, ttl_limit);
-     myfree(service);
- 
+     auto_clnt_control(sp->auto_clnt,
+ 		      AUTO_CLNT_CTL_HANDSHAKE, scache_clnt_handshake,
diff --git a/postfix.spec b/postfix.spec
index d5947b5..7632183 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -30,13 +30,13 @@ Summary(pl.UTF-8):	Serwer SMTP Postfix
 Summary(pt_BR.UTF-8):	Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):	Agent prenosu pošty Postfix
 Name:		postfix
-Version:	3.5.11
-Release:	2
+Version:	3.6.2
+Release:	1
 Epoch:		2
 License:	IBM Public License or Eclipse Public License v2.0
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5:	e970e8723e1b114643dc37e436bd5937
+# Source0-md5:	4718b498fa4285cf275f506c169f4746
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
@@ -65,6 +65,7 @@ Patch8:		%{name}-dictname.patch
 
 Patch11:	%{name}-scache_clnt.patch
 Patch12:	format-security.patch
+Patch13:	glibc-2.34.patch
 URL:		http://www.postfix.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	db-devel
@@ -314,6 +315,7 @@ find -type f | xargs %{__sed} -i -e 's|/etc/postfix|/etc/mail|g'
 %if %{with vda}
 %patch12 -p1
 %endif
+%patch13 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c