| 1 |
grobian 11/02/01 11:42:02 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: exim-4.74-r1.ebuild |
| 5 |
Removed: exim-4.74.ebuild |
| 6 |
Log: |
| 7 |
Grabbed some fixes from upstream to resolve misc building issues |
| 8 |
|
| 9 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.175 mail-mta/exim/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.175&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.175&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?r1=1.174&r2=1.175 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v |
| 21 |
retrieving revision 1.174 |
| 22 |
retrieving revision 1.175 |
| 23 |
diff -u -r1.174 -r1.175 |
| 24 |
--- ChangeLog 1 Feb 2011 08:03:32 -0000 1.174 |
| 25 |
+++ ChangeLog 1 Feb 2011 11:42:02 -0000 1.175 |
| 26 |
@@ -1,6 +1,13 @@ |
| 27 |
# ChangeLog for mail-mta/exim |
| 28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.174 2011/02/01 08:03:32 grobian Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.175 2011/02/01 11:42:02 grobian Exp $ |
| 31 |
+ |
| 32 |
+*exim-4.74-r1 (01 Feb 2011) |
| 33 |
+ |
| 34 |
+ 01 Feb 2011; Fabian Groffen <grobian@g.o> -exim-4.74.ebuild, |
| 35 |
+ +exim-4.74-r1.ebuild, +files/exim-4.74-makefile-command-envs.patch, |
| 36 |
+ +files/exim-4.74-makefile-posix.patch, +files/exim-4.74-pcre.patch: |
| 37 |
+ Grabbed some fixes from upstream to resolve misc building issues |
| 38 |
|
| 39 |
*exim-4.74 (01 Feb 2011) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 mail-mta/exim/exim-4.74-r1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: exim-4.74-r1.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2011 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.74-r1.ebuild,v 1.1 2011/02/01 11:42:02 grobian Exp $ |
| 54 |
|
| 55 |
EAPI="3" |
| 56 |
|
| 57 |
inherit eutils toolchain-funcs multilib pam |
| 58 |
|
| 59 |
IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis syslog spf srs gnutls sqlite dovecot-sasl radius maildir +dkim dcc dsn" |
| 60 |
|
| 61 |
DSN_EXIM_V=469 |
| 62 |
DSN_V=1_3 |
| 63 |
|
| 64 |
DESCRIPTION="A highly configurable, drop-in replacement for sendmail" |
| 65 |
SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 |
| 66 |
mirror://gentoo/system_filter.exim.gz |
| 67 |
dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch )" |
| 68 |
HOMEPAGE="http://www.exim.org/" |
| 69 |
|
| 70 |
SLOT="0" |
| 71 |
LICENSE="GPL-2" |
| 72 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 73 |
|
| 74 |
PROVIDE="virtual/mta" |
| 75 |
|
| 76 |
DEPEND=">=sys-apps/sed-4.0.5 |
| 77 |
>=sys-libs/db-3.2 |
| 78 |
dev-libs/libpcre |
| 79 |
perl? ( sys-devel/libperl ) |
| 80 |
pam? ( virtual/pam ) |
| 81 |
tcpd? ( sys-apps/tcp-wrappers ) |
| 82 |
ssl? ( >=dev-libs/openssl-0.9.6 ) |
| 83 |
gnutls? ( net-libs/gnutls |
| 84 |
dev-libs/libtasn1 ) |
| 85 |
ldap? ( >=net-nds/openldap-2.0.7 ) |
| 86 |
mysql? ( virtual/mysql ) |
| 87 |
postgres? ( dev-db/postgresql-base ) |
| 88 |
sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) |
| 89 |
spf? ( >=mail-filter/libspf2-1.2.5-r1 ) |
| 90 |
srs? ( mail-filter/libsrs_alt ) |
| 91 |
X? ( x11-proto/xproto |
| 92 |
x11-libs/libX11 |
| 93 |
x11-libs/libXmu |
| 94 |
x11-libs/libXt |
| 95 |
x11-libs/libXaw |
| 96 |
) |
| 97 |
sqlite? ( dev-db/sqlite ) |
| 98 |
radius? ( net-dialup/radiusclient ) |
| 99 |
virtual/libiconv |
| 100 |
" |
| 101 |
# added X check for #57206 |
| 102 |
RDEPEND="${DEPEND} |
| 103 |
!virtual/mta |
| 104 |
!net-mail/mailwrapper |
| 105 |
>=net-mail/mailbase-0.00-r5 |
| 106 |
virtual/logger |
| 107 |
dcc? ( mail-filter/dcc ) |
| 108 |
" |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
epatch "${FILESDIR}"/exim-4.14-tail.patch |
| 112 |
epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch |
| 113 |
epatch "${FILESDIR}"/exim-4.69-r1.27021.patch |
| 114 |
# from upstream |
| 115 |
epatch "${FILESDIR}"/${P}-pcre.patch |
| 116 |
epatch "${FILESDIR}"/${P}-makefile-posix.patch |
| 117 |
epatch "${FILESDIR}"/${P}-makefile-command-envs.patch |
| 118 |
|
| 119 |
use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch |
| 120 |
use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch |
| 121 |
} |
| 122 |
|
| 123 |
src_configure() { |
| 124 |
local myconf |
| 125 |
|
| 126 |
sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" "${S}"/src/configure.default |
| 127 |
cp "${S}"/src/configure.default "${S}"/src/configure.default.orig |
| 128 |
|
| 129 |
# includes typo fix for bug #47106 |
| 130 |
sed -e "48i\CFLAGS=${CFLAGS}" \ |
| 131 |
-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \ |
| 132 |
-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \ |
| 133 |
-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ |
| 134 |
-e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ |
| 135 |
-e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ |
| 136 |
-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \ |
| 137 |
-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \ |
| 138 |
-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=${EPREFIX}/usr/share/info:" \ |
| 139 |
-e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log:" \ |
| 140 |
-e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=${EPREFIX}/var/run/exim.pid:" \ |
| 141 |
-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim:" \ |
| 142 |
-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \ |
| 143 |
-e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \ |
| 144 |
-e "s:EXIM_USER=:EXIM_USER=mail:" \ |
| 145 |
-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \ |
| 146 |
-e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ |
| 147 |
-e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \ |
| 148 |
src/EDITME > Local/Makefile |
| 149 |
|
| 150 |
# exiscan-acl is now integrated - enable it when use-flag set |
| 151 |
if use exiscan-acl; then |
| 152 |
sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile |
| 153 |
sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile |
| 154 |
elif (use spf || use srs ) then |
| 155 |
eerror SPF and SRS support require exiscan-acl to be enabled, please add |
| 156 |
eerror to your USE settings. |
| 157 |
exit 1 |
| 158 |
fi |
| 159 |
|
| 160 |
if use spf; then |
| 161 |
myconf="${myconf} -lspf2" |
| 162 |
sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile |
| 163 |
mycflags="${mycflags} -DEXPERIMENTAL_SPF" |
| 164 |
fi |
| 165 |
if use srs; then |
| 166 |
myconf="${myconf} -lsrs_alt" |
| 167 |
sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile |
| 168 |
fi |
| 169 |
|
| 170 |
cd Local |
| 171 |
# enable optional exim_monitor support via X use flag bug #46778 |
| 172 |
if use X; then |
| 173 |
einfo "Configuring eximon" |
| 174 |
cp ../exim_monitor/EDITME eximon.conf |
| 175 |
sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile |
| 176 |
fi |
| 177 |
if use perl; then |
| 178 |
sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile |
| 179 |
fi |
| 180 |
# mbox useflag renamed, see bug #110741 |
| 181 |
if use mbx; then |
| 182 |
sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile |
| 183 |
fi |
| 184 |
if use pam; then |
| 185 |
sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile |
| 186 |
myconf="${myconf} -lpam" |
| 187 |
fi |
| 188 |
if use sasl; then |
| 189 |
sed -i "s:# CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/var/lib/sasl2/mux:" Makefile |
| 190 |
sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile |
| 191 |
myconf="${myconf} -lsasl2" |
| 192 |
fi |
| 193 |
if use tcpd; then |
| 194 |
sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile |
| 195 |
myconf="${myconf} -lwrap" |
| 196 |
fi |
| 197 |
if use lmtp; then |
| 198 |
sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile |
| 199 |
fi |
| 200 |
if use ipv6; then |
| 201 |
echo "HAVE_IPV6=YES" >> Makefile |
| 202 |
# to fix bug #41196 |
| 203 |
echo "IPV6_USE_INET_PTON=yes" >> Makefile |
| 204 |
fi |
| 205 |
if use dovecot-sasl; then |
| 206 |
sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Makefile |
| 207 |
fi |
| 208 |
if use radius; then |
| 209 |
myconf="${myconf} -lradiusclient" |
| 210 |
sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile |
| 211 |
sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile |
| 212 |
fi |
| 213 |
if [[ -n ${myconf} ]] ; then |
| 214 |
echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile |
| 215 |
fi |
| 216 |
|
| 217 |
# make iconv usage explicit |
| 218 |
echo "HAVE_ICONV=yes" >> Makefile |
| 219 |
# if we use libiconv, now is the time to tell so |
| 220 |
use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile |
| 221 |
|
| 222 |
cd "${S}" |
| 223 |
if use ssl; then |
| 224 |
sed -i \ |
| 225 |
-e "s:# \(SUPPORT_TLS=yes\):\1:" Local/Makefile |
| 226 |
if use gnutls; then |
| 227 |
sed -i \ |
| 228 |
-e "s:# \(USE_GNUTLS=yes\):\1:" \ |
| 229 |
-e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile |
| 230 |
else |
| 231 |
sed -i \ |
| 232 |
-e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile |
| 233 |
fi |
| 234 |
fi |
| 235 |
|
| 236 |
LOOKUP_INCLUDE= |
| 237 |
LOOKUP_LIBS= |
| 238 |
|
| 239 |
if use ldap; then |
| 240 |
sed -i \ |
| 241 |
-e "s:# \(LOOKUP_LDAP=yes\):\1:" \ |
| 242 |
-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile |
| 243 |
LOOKUP_INCLUDE="-I${EROOT}usr/include/ldap" |
| 244 |
LOOKUP_LIBS="-lldap -llber" |
| 245 |
fi |
| 246 |
|
| 247 |
if use mysql; then |
| 248 |
sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile |
| 249 |
LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/mysql" |
| 250 |
LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient" |
| 251 |
fi |
| 252 |
|
| 253 |
if use postgres; then |
| 254 |
sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile |
| 255 |
LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/postgresql" |
| 256 |
LOOKUP_LIBS="$LOOKUP_LIBS -lpq" |
| 257 |
fi |
| 258 |
if use sqlite; then |
| 259 |
sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile |
| 260 |
LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${EROOT}usr/include/sqlite" |
| 261 |
LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3" |
| 262 |
fi |
| 263 |
if [[ -n ${LOOKUP_INCLUDE} ]]; then |
| 264 |
sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \ |
| 265 |
Local/Makefile |
| 266 |
fi |
| 267 |
|
| 268 |
if [[ -n ${LOOKUP_LIBS} ]]; then |
| 269 |
sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \ |
| 270 |
Local/Makefile |
| 271 |
fi |
| 272 |
|
| 273 |
sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile |
| 274 |
|
| 275 |
sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile |
| 276 |
|
| 277 |
if use dnsdb; then |
| 278 |
sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile |
| 279 |
fi |
| 280 |
sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile |
| 281 |
|
| 282 |
if use nis; then |
| 283 |
sed -i -e "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" \ |
| 284 |
-e "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile |
| 285 |
fi |
| 286 |
if use syslog; then |
| 287 |
sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile |
| 288 |
fi |
| 289 |
if ! use dkim; then |
| 290 |
# DKIM is enabled by default. We have to explicitly disable it. |
| 291 |
echo "DISABLE_DKIM=yes">> Local/Makefile |
| 292 |
fi |
| 293 |
if use dcc; then |
| 294 |
echo "EXPERIMENTAL_DCC=yes">> Local/Makefile |
| 295 |
fi |
| 296 |
if use dsn; then |
| 297 |
sed -i -e "s:#define SUPPORT_DSN:define SUPPORT_DSN:" Local/Makefile |
| 298 |
fi |
| 299 |
|
| 300 |
# use the "native" interface to the DBM library |
| 301 |
echo "USE_DB=yes" >> "${S}"/Local/Makefile |
| 302 |
} |
| 303 |
|
| 304 |
src_compile() { |
| 305 |
emake -j1 CC="$(tc-getCC)" FULLECHO='' || die "make failed" |
| 306 |
} |
| 307 |
|
| 308 |
src_install () { |
| 309 |
cd "${S}"/build-exim-gentoo |
| 310 |
exeinto /usr/sbin |
| 311 |
doexe exim |
| 312 |
if use X; then |
| 313 |
doexe eximon.bin |
| 314 |
doexe eximon |
| 315 |
fi |
| 316 |
fperms 4755 /usr/sbin/exim |
| 317 |
|
| 318 |
dodir /usr/bin /usr/sbin /usr/lib |
| 319 |
|
| 320 |
dosym exim /usr/sbin/sendmail |
| 321 |
dosym exim /usr/sbin/rsmtp |
| 322 |
dosym exim /usr/sbin/rmail |
| 323 |
dosym /usr/sbin/exim /usr/bin/mailq |
| 324 |
dosym /usr/sbin/exim /usr/bin/newaliases |
| 325 |
dosym /usr/sbin/sendmail /usr/lib/sendmail |
| 326 |
|
| 327 |
exeinto /usr/sbin |
| 328 |
for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \ |
| 329 |
exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \ |
| 330 |
convert4r3 convert4r4 exipick |
| 331 |
do |
| 332 |
doexe $i |
| 333 |
done |
| 334 |
|
| 335 |
dodoc "${S}"/doc/* |
| 336 |
doman "${S}"/doc/exim.8 |
| 337 |
use dsn && dodoc "${S}"/README.DSN |
| 338 |
|
| 339 |
# conf files |
| 340 |
insinto /etc/exim |
| 341 |
newins "${S}"/src/configure.default.orig exim.conf.dist |
| 342 |
if use exiscan-acl; then |
| 343 |
newins "${S}"/src/configure.default exim.conf.exiscan-acl |
| 344 |
fi |
| 345 |
doins "${WORKDIR}"/system_filter.exim |
| 346 |
doins "${FILESDIR}"/auth_conf.sub |
| 347 |
|
| 348 |
pamd_mimic system-auth exim auth account |
| 349 |
|
| 350 |
insinto /etc/logrotate.d |
| 351 |
newins "${FILESDIR}/exim.logrotate" exim |
| 352 |
|
| 353 |
newinitd "${FILESDIR}"/exim.rc6 exim |
| 354 |
|
| 355 |
newconfd "${FILESDIR}"/exim.confd exim |
| 356 |
|
| 357 |
DIROPTIONS="--mode=0750 --owner=mail --group=mail" |
| 358 |
dodir /var/log/${PN} |
| 359 |
} |
| 360 |
|
| 361 |
pkg_postinst() { |
| 362 |
einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter." |
| 363 |
einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth." |
| 364 |
einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist." |
| 365 |
if use dcc ; then |
| 366 |
einfo "DCC support is experimental, you can find some limited" |
| 367 |
einfo "documentation at the bottom of this prerelease message:" |
| 368 |
einfo "http://article.gmane.org/gmane.mail.exim.devel/3579" |
| 369 |
fi |
| 370 |
} |
Archives