pyrox.dev
libmilter: 8.15.2 -> 8.17.1
Changelog:
```
[...]
8.16.1/8.16.1 2020/07/05
[...]
LIBMILTER: Fix typo in a macro. Patch from Ignacio Goyret
of Alcatel-Lucent.
LIBMILTER: Fix reference in xxfi_negotiate documentation.
Patch from Sven Neuhaus.
LIBMILTER: Fix function name in smfi_addrcpt_par documentation.
Patch from G.W. Haywood.
LIBMILTER: Fix a potential memory leak in smfi_setsymlist().
Patch from Martin Svec.
[...]
```
+12
-12
pkgs/development/libraries/libmilter/darwin.patch
+12
-12
pkgs/development/libraries/libmilter/darwin.patch
···
13
13
define(`confLDOPTS', `${Extra_LD_Flags}')
14
14
--- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200
15
15
+++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200
16
-
@@ -104,7 +104,11 @@
17
-
# endif /* NETX25 */
16
+
@@ -122,7 +122,11 @@
17
+
# endif
18
18
19
-
# if NAMED_BIND
20
-
-# include <arpa/nameser.h>
21
-
+# ifdef __APPLE__
22
-
+# include <arpa/nameser_compat.h>
23
-
+# else
24
-
+# include <arpa/nameser.h>
25
-
+# endif
26
-
# ifdef NOERROR
27
-
# undef NOERROR /* avoid <sys/streams.h> conflict */
28
-
# endif /* NOERROR */
19
+
#if NAMED_BIND
20
+
-# include <arpa/nameser.h>
21
+
+# ifdef __APPLE__
22
+
+# include <arpa/nameser_compat.h>
23
+
+# else
24
+
+# include <arpa/nameser.h>
25
+
+# endif
26
+
# ifdef NOERROR
27
+
# undef NOERROR /* avoid <sys/streams.h> conflict */
28
+
# endif
+3
-3
pkgs/development/libraries/libmilter/default.nix
+3
-3
pkgs/development/libraries/libmilter/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "libmilter";
5
-
version = "8.15.2";
5
+
version = "8.17.1";
6
6
7
7
src = fetchurl {
8
8
url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
9
-
sha256 = "0fdl9ndmspqspdlmghzxlaqk56j3yajk52d7jxcg21b7sxglpy94";
9
+
sha256 = "sha256-BLx2tsiG5tERvn/Y2qMrjOABKKKItrUuBnvCnzhUpuY=";
10
10
};
11
11
12
12
buildPhase = ''
···
32
32
sh Build -f ./a.m4
33
33
'';
34
34
35
-
patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ];
35
+
patches = [ ./install.patch ./sharedlib.patch ./darwin.patch ];
36
36
37
37
nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
38
38
-44
pkgs/development/libraries/libmilter/glibc-2.30.patch
-44
pkgs/development/libraries/libmilter/glibc-2.30.patch
···
1
-
diff --git a/libmilter/sm_gethost.c b/libmilter/sm_gethost.c
2
-
index 2423c34..f00468c 100644
3
-
--- a/libmilter/sm_gethost.c
4
-
+++ b/libmilter/sm_gethost.c
5
-
@@ -52,16 +52,8 @@ sm_getipnodebyname(name, family, flags, err)
6
-
bool resv6 = true;
7
-
struct hostent *h;
8
-
9
-
- if (family == AF_INET6)
10
-
- {
11
-
- /* From RFC2133, section 6.1 */
12
-
- resv6 = bitset(RES_USE_INET6, _res.options);
13
-
- _res.options |= RES_USE_INET6;
14
-
- }
15
-
SM_SET_H_ERRNO(0);
16
-
- h = gethostbyname(name);
17
-
- if (family == AF_INET6 && !resv6)
18
-
- _res.options &= ~RES_USE_INET6;
19
-
+ h = gethostbyname2(name, family);
20
-
21
-
/* the function is supposed to return only the requested family */
22
-
if (h != NULL && h->h_addrtype != family)
23
-
diff --git a/sendmail/conf.c b/sendmail/conf.c
24
-
index c73334e..500dafb 100644
25
-
--- a/sendmail/conf.c
26
-
+++ b/sendmail/conf.c
27
-
@@ -4243,16 +4243,8 @@ sm_getipnodebyname(name, family, flags, err)
28
-
# else /* HAS_GETHOSTBYNAME2 */
29
-
bool resv6 = true;
30
-
31
-
- if (family == AF_INET6)
32
-
- {
33
-
- /* From RFC2133, section 6.1 */
34
-
- resv6 = bitset(RES_USE_INET6, _res.options);
35
-
- _res.options |= RES_USE_INET6;
36
-
- }
37
-
SM_SET_H_ERRNO(0);
38
-
- h = gethostbyname(name);
39
-
- if (!resv6)
40
-
- _res.options &= ~RES_USE_INET6;
41
-
+ h = gethostbyname2(name, family);
42
-
43
-
/* the function is supposed to return only the requested family */
44
-
if (h != NULL && h->h_addrtype != family)