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