diff options
| -rw-r--r-- | mail-client/alpine/Manifest | 3 | ||||
| -rw-r--r-- | mail-client/alpine/alpine-2.00.ebuild | 20 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-lpam.patch | 13 |
3 files changed, 23 insertions, 13 deletions
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest index d60e6b5..a56c91c 100644 --- a/mail-client/alpine/Manifest +++ b/mail-client/alpine/Manifest @@ -1,4 +1,5 @@ +AUX 2.00-lpam.patch 295 RMD160 f3b34a9179529f4c25086559d57dc19d828356f1 SHA1 1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad DIST alpine-2.00-chappa-26-all.patch.gz 179066 RMD160 c109c463da0f6736474d6c114468bb524dca35ad SHA1 5d646dc9075d0f47cfb3ae2a66dd4ad3103f66f4 SHA256 a14b3cc49a0f7eef6459488687b2a15ff5318f5db8586a47aca04c5bce08aea5 DIST alpine-2.00.tar.bz2 5222673 RMD160 9e67704b23b3973d8b878e65ad9e6f5026c10d13 SHA1 dcbd3c5419954f484ccf706feaba31ce48cdebc4 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 -EBUILD alpine-2.00.ebuild 4037 RMD160 48c529bc8319cc43b5f9d44ecc33509c5e0200f4 SHA1 da012c3b1f7a7dbc5d11259310984ff0b1a19539 SHA256 997bd10ade8d641ffc556679755243cebdc89b301abce7a91086dd6f7daed551 +EBUILD alpine-2.00.ebuild 3751 RMD160 30d1c66eba875b0d42192ffeb971d9f9cd89c760 SHA1 0ea416b134771633d4e52d252f4efeae336270ab SHA256 16ba005213edf2e87b315272c9e97f384df0e64e77afc5e746fd04b6862d61c3 MISC metadata.xml 640 RMD160 c119e031ce500620da76dfcf67328e05f292c1c6 SHA1 6fc3b455d4cc83a601efd669a8c9f1c2641a6304 SHA256 5b19a81befa59e196971e823b86d26ff711c58240b0bcae0bcf5076a3133a6d2 diff --git a/mail-client/alpine/alpine-2.00.ebuild b/mail-client/alpine/alpine-2.00.ebuild index fb44bce..a6eb521 100644 --- a/mail-client/alpine/alpine-2.00.ebuild +++ b/mail-client/alpine/alpine-2.00.ebuild @@ -51,6 +51,12 @@ maildir_warn() { elog } +pkg_setup() { + if use smime && use topal ; then + ewarn "You can not have USE='smime topal'. Assuming topal is more important." + fi +} + src_unpack() { unpack ${P}.tar.bz2 } @@ -58,6 +64,8 @@ src_unpack() { src_prepare() { use chappa && epatch "${DISTDIR}"/${P}-chappa-${CHAPPA_PL}-all.patch.gz use topal && epatch /usr/share/topal/patches/${P}.patch + + epatch "${FILESDIR}"/2.00-lpam.patch } src_configure() { @@ -110,18 +118,6 @@ src_install() { fi } -pkg_setup() { - if use smime && use topal ; then - ewarn "You can not have USE='smime topal'. Assuming topal is more important." - fi - # untill someone finds the right solution, we filter --as-needed - # see http://www.gentoo.org/proj/en/qa/asneeded.xml section "Importance of linking order" - # it seems that "-lpam -ldl -lcrypto" get fed into link command to early - # imap/src/osdep/unix/Makefile - # imap/Makefile - append-ldflags -Wl,--no-as-needed -} - pkg_postinst() { use chappa && maildir_warn if use spell; then diff --git a/mail-client/alpine/files/2.00-lpam.patch b/mail-client/alpine/files/2.00-lpam.patch new file mode 100644 index 0000000..69e66d7 --- /dev/null +++ b/mail-client/alpine/files/2.00-lpam.patch @@ -0,0 +1,13 @@ +--- alpine-2.00.orig/alpine/Makefile.in ++++ alpine-2.00/alpine/Makefile.in +@@ -169,7 +169,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lpam + LIBTOOL = @LIBTOOL@ + LN = @LN@ + LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ |