Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/files/, mail-mta/opensmtpd/
Date: Sat, 25 Jun 2016 14:55:30
Message-Id: 1466866527.5f4012dfa79841e434eaac595d78759ce8f56bfa.zx2c4@gentoo
1 commit: 5f4012dfa79841e434eaac595d78759ce8f56bfa
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 25 14:54:08 2016 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 14:55:27 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4012df
7
8 mail-mta/opensmtpd: snapshot version bump
9
10 Package-Manager: portage-2.3.0_rc1
11
12 mail-mta/opensmtpd/Manifest | 2 +-
13 ...smtpd-5.9.2.201606071034_p1-ipv6-net-pton.patch | 50 ------------
14 .../opensmtpd-5.9.2.201606071034_p1-r1.ebuild | 94 ----------------------
15 ...uild => opensmtpd-5.9.2.201606220754_p1.ebuild} | 0
16 4 files changed, 1 insertion(+), 145 deletions(-)
17
18 diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
19 index 0ddb06a..8af3860 100644
20 --- a/mail-mta/opensmtpd/Manifest
21 +++ b/mail-mta/opensmtpd/Manifest
22 @@ -1,3 +1,3 @@
23 DIST opensmtpd-201606071034p1.tar.gz 692683 SHA256 e4a63195cb67fd705bc0ddfc3b7bcaff63b16ec141782fff1f5056050b1ad3f3 SHA512 5cb40279222a7fd610bc40ab20f28cc5d638497815a6c25b0dcae6ee1ffd0e1d35a9942c853cca4970e34a9ffb91f419e8c245bbcbbd9487e6128af8969569cb WHIRLPOOL e644854a6341fb962006d4b33522a9a3f22e8b4a6dc7d636cd34c854878d4c067577caecc24b4f95b5ff8fd467cf086df5fcee4cffcc00b8c237f2a91b5c98af
24 -DIST opensmtpd-201606152203p1.tar.gz 692715 SHA256 f91a91a6936bd634ba0643dea91b189d454b03d3c454f38f365bf73921aaf222 SHA512 3573424d7ac32ad2061c8c46a947377825c907368d060d14b16a886e46de90ce3b11b4be097bce692fce86f54072133a39d9644566a1e10e33d7a21bccf08f0f WHIRLPOOL 1fa23b57ef2700d4c21cc60ee37083afeb0270749db65a18eebf69f9ad72e0c38e1ec7aa27c5ee5e88bfeff0855ce4d39860cc431867febdaf97d0fbd1b4b6b6
25 +DIST opensmtpd-201606220754p1.tar.gz 692879 SHA256 4057ab61396b0a9de50fb2087aac3997757fa95f49de5d71db3a8ad49a9ae163 SHA512 33eba331d2dcbdf00e69f213b17175ad378108a7e8344e379a042bc6308300eda9c0d16cf15617beda003938b806937575ccad579113bc978877c212e87d3089 WHIRLPOOL a6f446fbfdec7ad017e9347ae0a452ab6d1e9f4dbb775acc781022c226c9423aa43aa5dd8f79726d5d202fe6d93cca94077a987817425c283c5f3337a7440b09
26 DIST opensmtpd-5.9.2p1.tar.gz 681855 SHA256 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d SHA512 99ca15101557848aa6d642f0c0171b152d805192e6839a97410b19431c981a21a5c0dc011e2c8cd91f3e6f6acb37a77f0f4c8e68114bf9808240392fe2b5d375 WHIRLPOOL 4d50474eb9f845633d152c065a0e70f3d41fba97134b33d3eb5164d39bdc58eeb4133b2f951a1815143a468144fb631f5f0b2960f57e7ba18a65321413fb5b6f
27
28 diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.9.2.201606071034_p1-ipv6-net-pton.patch b/mail-mta/opensmtpd/files/opensmtpd-5.9.2.201606071034_p1-ipv6-net-pton.patch
29 deleted file mode 100644
30 index 9841a7e..0000000
31 --- a/mail-mta/opensmtpd/files/opensmtpd-5.9.2.201606071034_p1-ipv6-net-pton.patch
32 +++ /dev/null
33 @@ -1,50 +0,0 @@
34 -From 988cff352d6b3dd5fe3224d7ebce361fca5c0b4f Mon Sep 17 00:00:00 2001
35 -From: gilles <gilles@×××××.org>
36 -Date: Wed, 8 Jun 2016 08:23:02 +0200
37 -Subject: [PATCH] on systems with a broken inet_net_pton() that does not
38 - support IPv6, fallback to broken_net_inet_pton_ipv6() when errno ==
39 - EAFNOSUPPORT
40 -
41 ----
42 - smtpd/to.c | 14 ++++++++++----
43 - 1 file changed, 10 insertions(+), 4 deletions(-)
44 -
45 -diff --git a/smtpd/to.c b/smtpd/to.c
46 -index 4a6a765..4b592be 100644
47 ---- a/smtpd/to.c
48 -+++ b/smtpd/to.c
49 -@@ -60,7 +60,7 @@ static int alias_is_filename(struct expandnode *, const char *, size_t);
50 - static int alias_is_include(struct expandnode *, const char *, size_t);
51 - static int alias_is_error(struct expandnode *, const char *, size_t);
52 -
53 --static int temp_inet_net_pton_ipv6(const char *, void *, size_t);
54 -+static int broken_inet_net_pton_ipv6(const char *, void *, size_t);
55 -
56 - const char *
57 - sockaddr_to_text(struct sockaddr *sa)
58 -@@ -301,8 +301,14 @@ text_to_netaddr(struct netaddr *netaddr, const char *s)
59 - } else {
60 - bits = inet_net_pton(AF_INET6, s, &ssin6.sin6_addr,
61 - sizeof(struct in6_addr));
62 -- if (bits == -1)
63 -- return 0;
64 -+ if (bits == -1) {
65 -+ if (errno != EAFNOSUPPORT)
66 -+ return 0;
67 -+ bits = broken_inet_net_pton_ipv6(s, &ssin6.sin6_addr,
68 -+ sizeof(struct in6_addr));
69 -+ if (bits == -1)
70 -+ return 0;
71 -+ }
72 - ssin6.sin6_family = AF_INET6;
73 - memcpy(&ss, &ssin6, sizeof(ssin6));
74 - #ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
75 -@@ -896,7 +902,7 @@ alias_is_error(struct expandnode *alias, const char *line, size_t len)
76 - }
77 -
78 - static int
79 --temp_inet_net_pton_ipv6(const char *src, void *dst, size_t size)
80 -+broken_inet_net_pton_ipv6(const char *src, void *dst, size_t size)
81 - {
82 - int ret;
83 - int bits;
84
85 diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2.201606071034_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2.201606071034_p1-r1.ebuild
86 deleted file mode 100644
87 index bec67bd..0000000
88 --- a/mail-mta/opensmtpd/opensmtpd-5.9.2.201606071034_p1-r1.ebuild
89 +++ /dev/null
90 @@ -1,94 +0,0 @@
91 -# Copyright 1999-2016 Gentoo Foundation
92 -# Distributed under the terms of the GNU General Public License v2
93 -# $Id$
94 -
95 -EAPI=5
96 -
97 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
98 -
99 -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
100 -HOMEPAGE="http://www.opensmtpd.org/"
101 -MY_P="${P}"
102 -if [ $(get_last_version_component_index) -eq 4 ]; then
103 - MY_P="${PN}-$(get_version_component_range 4-)"
104 -fi
105 -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
106 -
107 -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
108 -SLOT="0"
109 -KEYWORDS="~amd64 ~x86"
110 -IUSE="libressl pam +mta"
111 -
112 -DEPEND="!libressl? ( dev-libs/openssl:0 )
113 - libressl? ( dev-libs/libressl )
114 - sys-libs/zlib
115 - pam? ( virtual/pam )
116 - sys-libs/db:=
117 - dev-libs/libevent
118 - app-misc/ca-certificates
119 - net-mail/mailbase
120 - net-libs/libasr
121 - !mail-mta/courier
122 - !mail-mta/esmtp
123 - !mail-mta/exim
124 - !mail-mta/mini-qmail
125 - !mail-mta/msmtp[mta]
126 - !mail-mta/netqmail
127 - !mail-mta/nullmailer
128 - !mail-mta/postfix
129 - !mail-mta/qmail-ldap
130 - !mail-mta/sendmail
131 - !mail-mta/ssmtp[mta]
132 -"
133 -RDEPEND="${DEPEND}"
134 -
135 -S=${WORKDIR}/${MY_P/_}
136 -
137 -src_prepare() {
138 - # Use /run instead of /var/run
139 - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
140 - epatch "${FILESDIR}/${P}-ipv6-net-pton.patch"
141 - epatch_user
142 - eautoreconf
143 -}
144 -
145 -src_configure() {
146 - tc-export AR
147 - AR="$(which "$AR")" econf \
148 - --with-table-db \
149 - --with-user-smtpd=smtpd \
150 - --with-user-queue=smtpq \
151 - --with-group-queue=smtpq \
152 - --with-path-socket=/run \
153 - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
154 - --sysconfdir=/etc/opensmtpd \
155 - $(use_with pam auth-pam)
156 -}
157 -
158 -src_install() {
159 - default
160 - newinitd "${FILESDIR}"/smtpd.initd smtpd
161 - systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
162 - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
163 - if use mta ; then
164 - dodir /usr/sbin
165 - dosym /usr/sbin/smtpctl /usr/sbin/sendmail
166 - dosym /usr/sbin/smtpctl /usr/bin/sendmail
167 - dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
168 - fi
169 -}
170 -
171 -pkg_preinst() {
172 - enewgroup smtpd 25
173 - enewuser smtpd 25 -1 /var/empty smtpd
174 - enewgroup smtpq 252
175 - enewuser smtpq 252 -1 /var/empty smtpq
176 -}
177 -
178 -pkg_postinst() {
179 - einfo
180 - einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
181 - einfo "Redis, and many other useful addons and filters are"
182 - einfo "available in the mail-filter/opensmtpd-extras package."
183 - einfo
184 -}
185
186 diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2.201606152203_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2.201606220754_p1.ebuild
187 similarity index 100%
188 rename from mail-mta/opensmtpd/opensmtpd-5.9.2.201606152203_p1.ebuild
189 rename to mail-mta/opensmtpd/opensmtpd-5.9.2.201606220754_p1.ebuild