1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Update `mail/mailfromd' to version 8.5

- TIMESTAMP (mailfromd-8.5.tar.xz) = 1523602394

Reported by:	maintainer
This commit is contained in:
Alexey Dokuchaev 2018-04-14 10:11:12 +00:00
parent fa118aa30e
commit 563630a233
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=467304
3 changed files with 4 additions and 60 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mailfromd
PORTVERSION= 8.4
PORTREVISION= 1
PORTVERSION= 8.5
CATEGORIES= mail
MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
http://download.gnu.org.ua/pub/alpha/${PORTNAME}/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1509687308
SHA256 (mailfromd-8.4.tar.xz) = 2bc05fadf3bef1284f1e9b9ffe2335b0e5fc144ace67c7016527d977ea06556c
SIZE (mailfromd-8.4.tar.xz) = 1056656
TIMESTAMP = 1523602394
SHA256 (mailfromd-8.5.tar.xz) = 7796223635ce8a912a649de566f9595432590c6b6d38db7c56d61ab6b86fbbc3
SIZE (mailfromd-8.5.tar.xz) = 1054908

View File

@ -1,55 +0,0 @@
From 2d91db836a95a66c7b9ad1acb9dd0ebf93fb4f44 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Fri, 23 Mar 2018 11:00:37 +0000
Subject: Fix dns_resolve_ipstr
* lib/dns.c (dns_resolve_ipstr): Select rrtype depending on the
domain in question. This should produce the same results as it was
in the previous res_query implementation, which queried for T_ANY
and selected the first RR type returned.
--- lib/dns.c.orig 2017-11-03 05:06:35 UTC
+++ lib/dns.c
@@ -438,27 +438,35 @@ dns_resolve_ipstr(const char *ipstr, const char *domai
int rc;
adns_answer *ans;
char *name;
-
- if (!dns_str_is_ipv4(ipstr))
- return dns_failure;
- if (!domain) {
+ adns_rrtype type;
+
+ if (!domain || strcasecmp(domain, "in-addr.arpa") == 0) {
IPBUF ipbuf;
+ if (!dns_str_is_ipv4(ipstr))
+ return dns_failure;
if (dns_reverse_ipstr(ipstr, ipbuf))
return dns_failure;
mu_asprintf(&name, "%s.in-addr.arpa", ipbuf);
+ type = adns_r_ptr_raw;
} else {
mu_asprintf(&name, "%s.%s", ipstr, domain);
+ type = adns_r_a;
}
- rc = adns_synchronous(get_state(), name, adns_r_ptr_raw,
+ rc = adns_synchronous(get_state(), name, type,
DEFAULT_QFLAGS,
&ans);
free(name);
if (rc)
return errno_to_dns_status(rc);
status = adns_to_dns_status(ans->status);
- if (status == dns_success)
- *hbuf = mu_strdup(ans->rrs.str[0]);
+ if (status == dns_success) {
+ if (ans->type == adns_r_ptr_raw) {
+ *hbuf = mu_strdup(ans->rrs.str[0]);
+ } else {
+ *hbuf = mu_strdup(inet_ntoa(ans->rrs.inaddr[0]));
+ }
+ }
free(ans);
return status;
}