diff options
| -rw-r--r-- | mail-filter/libmilter/ChangeLog | 10 | ||||
| -rw-r--r-- | mail-filter/libmilter/Manifest | 15 | ||||
| -rw-r--r-- | mail-filter/libmilter/files/gentoo.config.m4 | 3 | ||||
| -rw-r--r-- | mail-filter/libmilter/files/libmilter-sharedlib.patch | 55 | ||||
| -rw-r--r-- | mail-filter/libmilter/libmilter-1.0.1.ebuild (renamed from mail-filter/libmilter/libmilter-8.14.3.ebuild) | 25 |
5 files changed, 94 insertions, 14 deletions
diff --git a/mail-filter/libmilter/ChangeLog b/mail-filter/libmilter/ChangeLog index fc708796551a..8bf430f8b97c 100644 --- a/mail-filter/libmilter/ChangeLog +++ b/mail-filter/libmilter/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-filter/libmilter # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/ChangeLog,v 1.19 2009/05/09 12:23:46 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/ChangeLog,v 1.20 2009/08/22 22:40:17 mrness Exp $ + +*libmilter-1.0.1 (22 Aug 2009) + + 22 Aug 2009; Alin Năstac <mrness@gentoo.org> files/gentoo.config.m4, + +files/libmilter-sharedlib.patch, +libmilter-1.0.1.ebuild, + -libmilter-8.14.3.ebuild: + Use the real libmilter version iso sendmail version. Install libmilter + library in both forms, static and dynamic (#245950). 09 May 2009; Alin Năstac <mrness@gentoo.org> libmilter-8.14.3.ebuild: Migrate to EAPI 2. diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest index bc9ecece6de4..a148b911e581 100644 --- a/mail-filter/libmilter/Manifest +++ b/mail-filter/libmilter/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gentoo.config.m4 72 RMD160 356f97a24ca303927dfd6bae45641c81bc627ce2 SHA1 0f46b51a323d54547e91762bff4c8b0ee230c63b SHA256 8383ce1c277408005dc0495a3cef6ad0e07591921af1de5a22d7e325c6da4f2c +AUX gentoo.config.m4 168 RMD160 5e2c01f2aef8688f595edfb9f0c3e20fd1c41827 SHA1 575bc1c6e06ddbf9eb578610c52a8be4d23275df SHA256 d3e541eae2b48528cda2790e346ed3de82f8cd8875d655f179c71ba6a76b7667 +AUX libmilter-sharedlib.patch 2825 RMD160 ee9e9a58b704aa619ae8c2f96438cfe6f868f413 SHA1 930223b6289558caefb293911849378d9105be39 SHA256 3670dd0ae715b6ceb48525700943cf39d362144e80d6c8e6f5154de5d57fe721 DIST sendmail.8.14.3.tar.gz 2069209 RMD160 5423360ce908c985827cf6524a6de87e3451c27a SHA1 814c54c3917aa6b0981b5ea99fb34e0c02f31489 SHA256 5cc69cdc055b587cbedad4efbf17c1dfc52a6ae18ec83a3d2e83e5f5fcdc119b -EBUILD libmilter-8.14.3.ebuild 1527 RMD160 90948bcb7a4ed28faa17f7a71b5a6264acd31aec SHA1 8ffe094318a616c2e4377d3660cf77b461378e63 SHA256 1d4828da43a978e01ac662c442f99273deb71994bedd8bf36edfdba67c2e3ad0 -MISC ChangeLog 2582 RMD160 7f01c72987a46f6d096d308169b69f419e2a1d20 SHA1 b0c6714e21ba855921346eeddf20b8f1e8d5df16 SHA256 50aadd1846c03bd243effbb8fa881b04bccb15ffe56d5df06c72239438b6b154 +EBUILD libmilter-1.0.1.ebuild 2022 RMD160 4df23e18f2dd782d931c6917ffb848afa1a06e7f SHA1 ecac75b3fd85c14b3c1a514a9e26cb659a34cc49 SHA256 f7ee2927bc97043b1a2065716d176b0d63cc5ae08f288abce98f3a348386f23c +MISC ChangeLog 2904 RMD160 68cb732d793c8a5d41b71e85dad863b86423db0c SHA1 8716c61d6855868a61e5bd1fccaaaa4c4586002b SHA256 7d2d8ff17b6a729827c54c83fa086cee4bc82acd9acfa15db87e9dea8313e1f6 MISC metadata.xml 387 RMD160 4db775b0c1fbbbea7bcb713fc930cc1d04a6c070 SHA1 4eece2dc2328ab8ea5a55f7f9e78c026c80d1920 SHA256 bf5a1a6ec411954637139410ebcb6f39bddaa09879ecdea4120883a4b32c84e5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkoFkfgACgkQts85UDFmaOX69wCdErCmrJteAn1ydm7HVrpol/56 -4jMAn3x9dHiOtqvAI8QUbyVePyHU9Uq7 -=H2lW +iEYEARECAAYFAkqQc9kACgkQ9A5kJBGSrsspeQCgo0QyalObXRI04bNXtUGMiexl +EA8AnAwK1RdFHFs8LdAlARkShzCHGE6L +=TLgj -----END PGP SIGNATURE----- diff --git a/mail-filter/libmilter/files/gentoo.config.m4 b/mail-filter/libmilter/files/gentoo.config.m4 index 26f109ec50a2..5e1b55faa580 100644 --- a/mail-filter/libmilter/files/gentoo.config.m4 +++ b/mail-filter/libmilter/files/gentoo.config.m4 @@ -1,2 +1,5 @@ define(`confOPTIMIZE', `@@CFLAGS@@') +define(`confLDOPTS', `@@LDFLAGS@@') +define(`confCC', `@@CC@@') define(`confENVDEF', `@@ENVDEF@@') +define(`confCCOPTS_SO', `-fPIC') diff --git a/mail-filter/libmilter/files/libmilter-sharedlib.patch b/mail-filter/libmilter/files/libmilter-sharedlib.patch new file mode 100644 index 000000000000..05f2e025e39a --- /dev/null +++ b/mail-filter/libmilter/files/libmilter-sharedlib.patch @@ -0,0 +1,55 @@ +diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 +--- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 ++++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200 +@@ -0,0 +1,39 @@ ++divert(-1) ++# ++# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. ++# All rights reserved. ++# ++# By using this file, you agree to the terms and conditions set ++# forth in the LICENSE file which can be found at the top level of ++# the sendmail distribution. ++# ++# ++# Definitions for Makefile construction for sendmail ++# ++divert(0)dnl ++include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl ++bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl ++bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl ++bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl ++bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl ++ ++include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') ++divert(bldTARGETS_SECTION) ++bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} ++ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ++bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} ++ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} ++ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a ++ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') ++ ++install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ++ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') ++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER} ++ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so ++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') ++ ++bldCURRENT_PRODUCT-clean: ++ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} ++ ++divert(0) ++COPTS+= confCCOPTS_SO +diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 +--- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 ++++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 +@@ -9,7 +9,7 @@ + SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') + PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') + +-bldPRODUCT_START(`library', `libmilter') ++bldPRODUCT_START(`milterlibrary', `libmilter') + define(`bldINSTALLABLE', `true') + define(`LIBMILTER_EXTRAS', `errstring.c strl.c') + APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') diff --git a/mail-filter/libmilter/libmilter-8.14.3.ebuild b/mail-filter/libmilter/libmilter-1.0.1.ebuild index 1d735dba0308..d0484151fc23 100644 --- a/mail-filter/libmilter/libmilter-8.14.3.ebuild +++ b/mail-filter/libmilter/libmilter-1.0.1.ebuild @@ -1,14 +1,20 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/libmilter-8.14.3.ebuild,v 1.8 2009/05/09 12:23:46 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/libmilter/libmilter-1.0.1.ebuild,v 1.1 2009/08/22 22:40:17 mrness Exp $ EAPI="2" inherit eutils toolchain-funcs +# This library is part of sendmail, but it does not share the version number with it. +# In order to find the right libmilter version number, check SMFI_VERSION definition +# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines). +# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001. +SENDMAIL_VER=8.14.3 + DESCRIPTION="The Sendmail Filter API (Milter)" HOMEPAGE="http://www.sendmail.org/" -SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${PV}.tar.gz" +SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz" LICENSE="Sendmail" SLOT="0" @@ -18,32 +24,39 @@ IUSE="ipv6 poll" DEPEND="!mail-mta/sendmail" RDEPEND="${DEPEND}" -S="${WORKDIR}/sendmail-${PV}" +S="${WORKDIR}/sendmail-${SENDMAIL_VER}" src_prepare() { + epatch "${FILESDIR}"/${PN}-sharedlib.patch + + local CC="$(tc-getCC)" local ENVDEF="-DNETUNIX -DNETINET" use ipv6 && ENVDEF="${ENVDEF} -DNETINET6" use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1" - sed -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \ + sed -e "s:@@CFLAGS@@:${CFLAGS}:" \ + -e "s:@@LDFLAGS@@:${LDFLAGS}:" \ + -e "s:@@CC@@:${CC}:" \ + -e "s:@@ENVDEF@@:${ENVDEF}:" \ "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \ || die "failed to generate site.config.m4" } src_compile() { pushd libmilter - emake -j1 CC="$(tc-getCC)" || die "libmilter compilation failed" + emake -j1 MILTER_SOVER=${PV} || die "libmilter compilation failed" popd } src_install () { local MY_LIBDIR=/usr/$(get_libdir) - dodir "${MY_LIBDIR}" /usr/include/libmilter + dodir "${MY_LIBDIR}" emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ MSPQOWN=root CFOWN=root CFGRP=root \ + MILTER_SOVER=${PV} \ install -C obj.*/libmilter \ || die "install failed" |