diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/libmilter | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libmilter')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmilter/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmilter/glibc-2.30.patch | 44 |
2 files changed, 45 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/nixpkgs/pkgs/development/libraries/libmilter/default.nix index 3eb688f95721..8d677d858de8 100644 --- a/nixpkgs/pkgs/development/libraries/libmilter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmilter/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sh Build -f ./a.m4 ''; - patches = [ ./install.patch ./sharedlib.patch ]; + patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ]; nativeBuildInputs = [ m4 ]; diff --git a/nixpkgs/pkgs/development/libraries/libmilter/glibc-2.30.patch b/nixpkgs/pkgs/development/libraries/libmilter/glibc-2.30.patch new file mode 100644 index 000000000000..e72ec9911e37 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmilter/glibc-2.30.patch @@ -0,0 +1,44 @@ +diff --git a/libmilter/sm_gethost.c b/libmilter/sm_gethost.c +index 2423c34..f00468c 100644 +--- a/libmilter/sm_gethost.c ++++ b/libmilter/sm_gethost.c +@@ -52,16 +52,8 @@ sm_getipnodebyname(name, family, flags, err) + bool resv6 = true; + struct hostent *h; + +- if (family == AF_INET6) +- { +- /* From RFC2133, section 6.1 */ +- resv6 = bitset(RES_USE_INET6, _res.options); +- _res.options |= RES_USE_INET6; +- } + SM_SET_H_ERRNO(0); +- h = gethostbyname(name); +- if (family == AF_INET6 && !resv6) +- _res.options &= ~RES_USE_INET6; ++ h = gethostbyname2(name, family); + + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) +diff --git a/sendmail/conf.c b/sendmail/conf.c +index c73334e..500dafb 100644 +--- a/sendmail/conf.c ++++ b/sendmail/conf.c +@@ -4243,16 +4243,8 @@ sm_getipnodebyname(name, family, flags, err) + # else /* HAS_GETHOSTBYNAME2 */ + bool resv6 = true; + +- if (family == AF_INET6) +- { +- /* From RFC2133, section 6.1 */ +- resv6 = bitset(RES_USE_INET6, _res.options); +- _res.options |= RES_USE_INET6; +- } + SM_SET_H_ERRNO(0); +- h = gethostbyname(name); +- if (!resv6) +- _res.options &= ~RES_USE_INET6; ++ h = gethostbyname2(name, family); + + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) |