1 |
hollow 07/09/16 08:16:29 |
2 |
|
3 |
Modified: ChangeLog vpopmail-5.4.19.ebuild |
4 |
Added: vpopmail-5.4.20.ebuild |
5 |
Log: |
6 |
version bump; #191131 |
7 |
(Portage version: 2.1.3.9) |
8 |
|
9 |
Revision Changes Path |
10 |
1.83 net-mail/vpopmail/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/ChangeLog?rev=1.83&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/ChangeLog?rev=1.83&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/ChangeLog?r1=1.82&r2=1.83 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v |
19 |
retrieving revision 1.82 |
20 |
retrieving revision 1.83 |
21 |
diff -u -r1.82 -r1.83 |
22 |
--- ChangeLog 29 Jul 2007 23:00:10 -0000 1.82 |
23 |
+++ ChangeLog 16 Sep 2007 08:16:28 -0000 1.83 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for net-mail/vpopmail |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.82 2007/07/29 23:00:10 hollow Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.83 2007/09/16 08:16:28 hollow Exp $ |
29 |
+ |
30 |
+*vpopmail-5.4.20 (16 Sep 2007) |
31 |
+ |
32 |
+ 16 Sep 2007; Benedikt Böhm <hollow@g.o> vpopmail-5.4.19.ebuild, |
33 |
+ +vpopmail-5.4.20.ebuild: |
34 |
+ version bump; #191131 |
35 |
|
36 |
*vpopmail-5.4.19 (29 Jul 2007) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.2 net-mail/vpopmail/vpopmail-5.4.19.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild?rev=1.2&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild?rev=1.2&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild?r1=1.1&r2=1.2 |
46 |
|
47 |
Index: vpopmail-5.4.19.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild,v |
50 |
retrieving revision 1.1 |
51 |
retrieving revision 1.2 |
52 |
diff -u -r1.1 -r1.2 |
53 |
--- vpopmail-5.4.19.ebuild 29 Jul 2007 23:00:10 -0000 1.1 |
54 |
+++ vpopmail-5.4.19.ebuild 16 Sep 2007 08:16:28 -0000 1.2 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2007 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild,v 1.1 2007/07/29 23:00:10 hollow Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild,v 1.2 2007/09/16 08:16:28 hollow Exp $ |
60 |
|
61 |
inherit eutils fixheadtails autotools |
62 |
|
63 |
@@ -199,4 +199,20 @@ |
64 |
elog |
65 |
elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider" |
66 |
elog "using net-mail/relay-ctrl instead." |
67 |
+ |
68 |
+ if use mysql; then |
69 |
+ elog |
70 |
+ elog "If you are upgrading from 5.4.17 or older, you have to fix your" |
71 |
+ elog "MySQL tables:" |
72 |
+ elog |
73 |
+ elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;' |
74 |
+ elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;' |
75 |
+ elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;' |
76 |
+ elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;' |
77 |
+ elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;' |
78 |
+ elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;' |
79 |
+ elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,' |
80 |
+ elog ' ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,' |
81 |
+ elog ' ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;' |
82 |
+ fi |
83 |
} |
84 |
|
85 |
|
86 |
|
87 |
1.1 net-mail/vpopmail/vpopmail-5.4.20.ebuild |
88 |
|
89 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.20.ebuild?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.20.ebuild?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: vpopmail-5.4.20.ebuild |
93 |
=================================================================== |
94 |
# Copyright 1999-2007 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.20.ebuild,v 1.1 2007/09/16 08:16:28 hollow Exp $ |
97 |
|
98 |
inherit eutils fixheadtails autotools |
99 |
|
100 |
HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" |
101 |
DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers." |
102 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
103 |
|
104 |
LICENSE="GPL-2" |
105 |
SLOT="0" |
106 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86" |
107 |
IUSE="clearpasswd ipalias maildrop mysql" |
108 |
|
109 |
DEPEND="virtual/qmail |
110 |
maildrop? ( mail-filter/maildrop ) |
111 |
mysql? ( virtual/mysql ) |
112 |
" |
113 |
|
114 |
# This makes sure the variable is set, and that it isn't null. |
115 |
VPOP_DEFAULT_HOME="/var/vpopmail" |
116 |
|
117 |
# qmail home directory |
118 |
QMAIL_HOME="/var/qmail" |
119 |
|
120 |
vpopmail_set_homedir() { |
121 |
VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6) |
122 |
if [[ -z "${VPOP_HOME}" ]]; then |
123 |
ebeep |
124 |
eerror "vpopmail's home directory is null in passwd data!" |
125 |
eerror "You probably want to check that out." |
126 |
eerror "Continuing with default." |
127 |
VPOP_HOME="${VPOP_DEFAULT_HOME}" |
128 |
else |
129 |
einfo "Setting VPOP_HOME to: $VPOP_HOME" |
130 |
fi |
131 |
} |
132 |
|
133 |
pkg_setup() { |
134 |
enewgroup vpopmail 89 |
135 |
enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail |
136 |
upgradewarning |
137 |
} |
138 |
|
139 |
src_unpack() { |
140 |
unpack ${A} |
141 |
cd "${S}" |
142 |
|
143 |
epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch |
144 |
epatch "${FILESDIR}"/${PN}-lazy.patch |
145 |
|
146 |
# fix maildir paths |
147 |
sed -i -e 's|Maildir|.maildir|g' \ |
148 |
vchkpw.c vconvert.c vdelivermail.c \ |
149 |
vpopbull.c vpopmail.c vqmaillocal.c \ |
150 |
vuserinfo.c maildirquota.c || die |
151 |
|
152 |
# remove vpopmail advertisement |
153 |
sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \ |
154 |
vdelivermail.c vpopbull.c vqmaillocal.c || die |
155 |
|
156 |
eautoreconf |
157 |
ht_fix_file "${S}"/cdb/Makefile || die "failed to fix file" |
158 |
} |
159 |
|
160 |
src_compile() { |
161 |
vpopmail_set_homedir |
162 |
|
163 |
if use mysql; then |
164 |
authopts=" \ |
165 |
--enable-auth-module=mysql \ |
166 |
--enable-libs=/usr/include/mysql \ |
167 |
--enable-libdir=/usr/lib/mysql \ |
168 |
--enable-sql-logging \ |
169 |
--enable-valias \ |
170 |
--disable-mysql-replication \ |
171 |
--enable-mysql-limits" |
172 |
else |
173 |
authopts="--enable-auth-module=cdb" |
174 |
fi |
175 |
|
176 |
econf ${authopts} \ |
177 |
--sysconfdir=${VPOP_HOME}/etc \ |
178 |
--enable-non-root-build \ |
179 |
--enable-qmaildir=${QMAIL_HOME} \ |
180 |
--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \ |
181 |
--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \ |
182 |
--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \ |
183 |
--enable-vpopuser=vpopmail \ |
184 |
--enable-vpopgroup=vpopmail \ |
185 |
--enable-many-domains \ |
186 |
--enable-file-locking \ |
187 |
--enable-file-sync \ |
188 |
--enable-md5-passwords \ |
189 |
--enable-logging \ |
190 |
--enable-auth-logging \ |
191 |
--enable-log-name=vpopmail \ |
192 |
--enable-qmail-ext \ |
193 |
--disable-tcp-rules-prog \ |
194 |
--disable-tcpserver-file \ |
195 |
--disable-roaming-users \ |
196 |
$(use_enable ipalias ip-alias-domains) \ |
197 |
$(use_enable clearpasswd clear-passwd) \ |
198 |
$(use_enable maildrop) \ |
199 |
|| die "configure failed" |
200 |
|
201 |
emake || die "make failed" |
202 |
} |
203 |
|
204 |
src_install() { |
205 |
vpopmail_set_homedir |
206 |
|
207 |
make DESTDIR="${D}" install || die "make install failed" |
208 |
keepdir "${VPOP_HOME}"/domains |
209 |
|
210 |
# install helper script for maildir conversion |
211 |
into /var/vpopmail |
212 |
dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh |
213 |
into /usr |
214 |
|
215 |
# install documentation |
216 |
dodoc AUTHORS ChangeLog FAQ INSTALL README* |
217 |
dohtml doc/doc_html/* doc/man_html/* |
218 |
rm -rf "${D}"/"${VPOP_HOME}"/doc |
219 |
dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc |
220 |
|
221 |
# create /etc/vpopmail.conf |
222 |
if use mysql; then |
223 |
einfo "Installing vpopmail mysql configuration file" |
224 |
dodir /etc |
225 |
# config file position |
226 |
mv "${D}"/var/vpopmail/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf |
227 |
dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql |
228 |
sed -e '12d' -i "${D}"/etc/vpopmail.conf |
229 |
echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf |
230 |
echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf |
231 |
echo '# Write DB' >>${D}/etc/vpopmail.conf |
232 |
echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf |
233 |
# lock down perms |
234 |
fperms 640 /etc/vpopmail.conf |
235 |
fowners root:vpopmail /etc/vpopmail.conf |
236 |
fi |
237 |
|
238 |
einfo "Installing env.d entry" |
239 |
dodir /etc/env.d |
240 |
doenvd "${FILESDIR}"/99vpopmail |
241 |
|
242 |
einfo "Locking down vpopmail permissions" |
243 |
fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include} |
244 |
fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw |
245 |
fperms 4711 "${VPOP_HOME}"/bin/vchkpw |
246 |
} |
247 |
|
248 |
pkg_postinst() { |
249 |
einfo "Performing post-installation routines for ${P}" |
250 |
|
251 |
if use mysql ; then |
252 |
elog |
253 |
elog "You have 'mysql' turned on in your USE" |
254 |
elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'" |
255 |
elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file" |
256 |
elog |
257 |
elog "First log into mysql as your mysql root user and pass. Then:" |
258 |
elog "> create database vpopmail;" |
259 |
elog "> use mysql;" |
260 |
elog "> grant select, insert, update, delete, create, drop on vpopmail.* to" |
261 |
elog " vpopmail@localhost identified by 'your password';" |
262 |
elog "> flush privileges;" |
263 |
elog |
264 |
elog "If you have problems with vpopmail not accepting mail properly," |
265 |
elog "please ensure that /etc/vpopmail.conf is chmod 640 and" |
266 |
elog "owned by root:vpopmail" |
267 |
fi |
268 |
|
269 |
# do this for good measure |
270 |
if [ -e /etc/vpopmail.conf ] ; then |
271 |
chmod 640 /etc/vpopmail.conf |
272 |
chown root:vpopmail /etc/vpopmail.conf |
273 |
fi |
274 |
|
275 |
upgradewarning |
276 |
} |
277 |
|
278 |
pkg_postrm() { |
279 |
vpopmail_set_homedir |
280 |
|
281 |
elog "The vpopmail DATA will NOT be removed automatically." |
282 |
elog "You can delete them manually by removing the ${VPOP_HOME} directory." |
283 |
} |
284 |
|
285 |
upgradewarning() { |
286 |
ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" |
287 |
ewarn "The internal structure of the mail storage has changed for" |
288 |
ewarn "consistancy with the rest of Gentoo! Please review and utilize the " |
289 |
ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh" |
290 |
ewarn "to upgrade your system! (It can do conversions both ways)." |
291 |
ewarn "You should be able to run it right away without any changes." |
292 |
elog |
293 |
elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider" |
294 |
elog "using net-mail/relay-ctrl instead." |
295 |
|
296 |
if use mysql; then |
297 |
elog |
298 |
elog "If you are upgrading from 5.4.17 or older, you have to fix your" |
299 |
elog "MySQL tables:" |
300 |
elog |
301 |
elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;' |
302 |
elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;' |
303 |
elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;' |
304 |
elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;' |
305 |
elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;' |
306 |
elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;' |
307 |
elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,' |
308 |
elog ' ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,' |
309 |
elog ' ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;' |
310 |
fi |
311 |
} |
312 |
|
313 |
|
314 |
|
315 |
-- |
316 |
gentoo-commits@g.o mailing list |