Remove pic USEflag, and build c-client with -fPIC unconditionally. Closes bug #101051.
authorAndrej Kacian <ticho@gentoo.org>
Thu, 6 Oct 2005 21:03:30 +0000 (21:03 +0000)
committerAndrej Kacian <ticho@gentoo.org>
Thu, 6 Oct 2005 21:03:30 +0000 (21:03 +0000)
Package-Manager: portage-2.0.51.22-r2

net-mail/uw-imap/ChangeLog
net-mail/uw-imap/Manifest
net-mail/uw-imap/files/digest-uw-imap-2004g-r2 [new file with mode: 0644]
net-mail/uw-imap/uw-imap-2004g-r2.ebuild [new file with mode: 0644]

index 4066516289cc464c8c221ae79c138ace3f22ed97..9ef5e94c292a0fd94d711c660d2b0a161c99013a 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.77 2005/10/06 19:31:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.78 2005/10/06 21:03:30 ticho Exp $
+
+*uw-imap-2004g-r2 (06 Oct 2005)
+
+  06 Oct 2005; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004g-r2.ebuild:
+  Remove pic USEflag, and build c-client with -fPIC unconditionally. Closes
+  bug #101051.
 
   06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   uw-imap-2004g-r1.ebuild:
index 5ebe881e3f40897ba320eec02b104d841f5ed39e..5fc109fc4b78c5c70449fac5d6d45ba27d276986 100644 (file)
@@ -2,33 +2,35 @@
 Hash: SHA1
 
 MD5 e9a05288ecb9fada22fff84bf0c5962c uw-imap-2004a.ebuild 3292
-MD5 d1bc1618ec3314f4cc0ba36d64b63574 ChangeLog 11058
-MD5 2a95a847286c5b23cb291f923f75c6e0 uw-imap-2004c-r2.ebuild 4648
-MD5 f3ec9bb4aab0e6c37b20265378f7d413 uw-imap-2004c-r3.ebuild 5209
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 2a413902735c6bf3279f5d4cb3b2bacc uw-imap-2004g-r1.ebuild 5186
-MD5 f8341ad011ccea95c157f34f869a0a69 uw-imap-2004c.ebuild 3296
 MD5 f86653fdd59e2727644fc31305b236c2 uw-imap-2004c-r1.ebuild 4127
+MD5 f8341ad011ccea95c157f34f869a0a69 uw-imap-2004c.ebuild 3296
+MD5 f3ec9bb4aab0e6c37b20265378f7d413 uw-imap-2004c-r3.ebuild 5209
 MD5 a38cbc05bb48226fbefeeb3f71585d6b uw-imap-2004g.ebuild 5209
-MD5 dfcbb9b410d2d513c15520e713043769 files/uw-ipop3.xinetd 472
-MD5 113b8cca9a203707f69bd0f6632ded57 files/uw-imap.pam-system-auth 343
+MD5 a48772d2dc14e024d2ba90ebb471e336 ChangeLog 11254
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 685d1d67143d2ec91915720efa52e968 uw-imap-2004g-r2.ebuild 5130
+MD5 2a95a847286c5b23cb291f923f75c6e0 uw-imap-2004c-r2.ebuild 4648
 MD5 506e7347cac698714cf5cd60eca761ba files/uw-ipop2.xinetd 563
-MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g-r1 62
+MD5 7fe0f2231e5e0d8b491a8c9780048ac3 files/uw-ipop3s.xinetd 469
+MD5 a0d3f290ad8a98968896a5315628d473 files/uw-imap.xinetd 491
 MD5 86da98c03bc68723a437d2cf135b0775 files/digest-uw-imap-2004a 62
-MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r1 63
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c 63
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g 62
+MD5 113b8cca9a203707f69bd0f6632ded57 files/uw-imap.pam-system-auth 343
+MD5 dfcbb9b410d2d513c15520e713043769 files/uw-ipop3.xinetd 472
+MD5 f93adbc027c40ed405bbde4bb1330f2d files/uw-imaps.xinetd 486
 MD5 cde23dc2375a8c33998202c8f0c9ae0e files/uw-imap-2004c-amd64-so-fix.patch 675
+MD5 f9441b5a20dd2477f12e0b0f04e2748d files/uw-imap.pam 243
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r1 63
 MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r2 63
 MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r3 63
-MD5 f9441b5a20dd2477f12e0b0f04e2748d files/uw-imap.pam 243
-MD5 f93adbc027c40ed405bbde4bb1330f2d files/uw-imaps.xinetd 486
-MD5 7fe0f2231e5e0d8b491a8c9780048ac3 files/uw-ipop3s.xinetd 469
-MD5 a0d3f290ad8a98968896a5315628d473 files/uw-imap.xinetd 491
-MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g 62
-MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c 63
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g-r1 62
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g-r2 62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDRXuqKRy60XGEcJIRAjlrAJ4uyKnycabvLi5Y9LJ9Q2sjSSbvVQCeLtWg
-b98YHxZvMNiJqzRHN0BNsvs=
-=97NS
+iD8DBQFDRZFGQlM6RnzZP+IRAu/BAKC8vQlgH2K2sa5byGhzNVY/BcThNQCfePGu
+Sy0qVEUq2uYavhrcrshatQw=
+=rsZs
 -----END PGP SIGNATURE-----
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004g-r2 b/net-mail/uw-imap/files/digest-uw-imap-2004g-r2
new file mode 100644 (file)
index 0000000..08b5c3d
--- /dev/null
@@ -0,0 +1 @@
+MD5 9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z 2246713
diff --git a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild b/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
new file mode 100644 (file)
index 0000000..a3ffacc
--- /dev/null
@@ -0,0 +1,185 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r2.ebuild,v 1.1 2005/10/06 21:03:30 ticho Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="imap-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~sparc ~x86"
+IUSE="ipv6 ssl kerberos clearpasswd"
+
+PROVIDE="virtual/imapd"
+PROVIDE="${PROVIDE} virtual/imap-c-client"
+DEPEND="!net-mail/vimap
+       !virtual/imap-c-client
+       >=net-mail/uw-mailutils-2004g
+       virtual/libc
+       >=sys-libs/pam-0.72
+       >=net-mail/mailbase-0.00-r8
+       ssl? ( dev-libs/openssl )
+       kerberos? ( virtual/krb5 )"
+
+pkg_setup() {
+       echo
+       if use clearpasswd; then
+               ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
+               ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
+       else
+               if use ssl; then
+                       ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
+                       ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
+               else
+                       ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
+                       ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
+                       ewarn "USE flag."
+                       die "Impossible USE flag combination, see above message"
+               fi
+       fi
+       echo
+       # ewarn people not using pam with this file
+       if ! built_with_use net-mail/mailbase pam ; then
+               echo
+               ewarn "It is needed to have the net-mail/mailbase package"
+               ewarn "  built with the pam use flag activated. Please rebuild"
+               ewarn "  net-mail/mailbase with pam activated."
+               echo
+               die "mailbase has to be built with pam use flag"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       # Tarball packed with bad file perms
+       chmod -R ug+w ${S}
+
+       cd ${S}
+
+       if use amd64; then
+               # Apply our patch to actually build the shared library for PHP5
+               epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+       fi
+
+       # Now we must make all the individual Makefiles use different CFLAGS,
+       # otherwise they would all use -fPIC
+       sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
+               src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
+               src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
+               || die "sed failed patching Makefile CFLAGS."
+       # Now there is only c-client left, which should be built with -fPIC
+       append-flags -fPIC
+
+       cd ${S}/src/osdep/unix/
+       cp Makefile Makefile.orig
+       sed \
+               -e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+               -e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+               -e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+               < Makefile.orig > Makefile
+
+       # Uncomment this for MBX support
+       #cp Makefile Makefile.orig2
+       #sed \
+       #       -e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
+       #       -e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
+       #       < Makefile.orig2 > Makefile
+}
+
+src_compile() {
+       local mymake
+       local ipver
+       ipver="IP=4"
+
+       use ipv6 && echo ipv6
+       use kerberos && echo kerberos
+       use ssl && echo ssl
+       use ipv6 && ipver="IP=6"
+       use kerberos \
+         && mymake="EXTRAAUTHENTICATORS=gss"
+       if use ssl; then
+               cd ${S}
+               echo ${mymake}
+               if use clearpasswd; then
+                       yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || die
+               else
+                       yes | make lnp ${mymake} ${ipver} SSLTYPE=unix.nopwd EXTRACFLAGS="${CFLAGS}" || die
+               fi
+
+
+               local i
+               for i in imapd ipop3d; do
+                       umask 077
+                       PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
+                       PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
+                       /usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
+                                -nodes -x509 -days 365 -out  $$PEM2 << EOF
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root@localhost.localdomain
+EOF
+
+                       cat $$PEM1 >  ${i}.pem
+                       echo ""    >> ${i}.pem
+                       cat $$PEM2 >> ${i}.pem
+                       rm $$PEM1 $$PEM2
+                       umask 022
+               done
+       else
+               yes | make lnp ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
+       fi
+}
+
+src_install() {
+       into /usr
+       dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+       dobin mlock/mlock
+
+       if use ssl; then
+               dodir /etc/ssl/certs
+               mv imapd.pem ${D}/etc/ssl/certs
+               mv ipop3d.pem ${D}/etc/ssl/certs
+       fi
+
+       if use amd64; then
+               dolib.so c-client/libc-client.so.1.0.0
+               cd ${D}/usr/$(get_libdir)
+               ln -s libc-client.so.1.0.0 libc-client.so.1
+               ln -s libc-client.so.1.0.0 libc-client.so
+       fi
+
+       cd ${S}
+
+       insinto /usr/include/imap
+       doins c-client/{c-client,mail,imap4r1,rfc822,misc,smtp,nntp}.h
+       doins c-client/linkage.{c,h}
+       doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
+       dolib.a c-client/c-client.a
+       dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
+
+       doman src/ipopd/ipopd.8 src/imapd/imapd.8
+       doman src/dmail/dmail.1 src/tmail/tmail.1
+
+       dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
+
+       docinto rfc
+       dodoc docs/rfc/*.txt
+
+       # gentoo config stuff
+       insinto /etc/xinetd.d
+       newins ${FILESDIR}/uw-imap.xinetd  imap
+       newins ${FILESDIR}/uw-ipop2.xinetd ipop2
+       newins ${FILESDIR}/uw-ipop3.xinetd ipop3
+       newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
+       newins ${FILESDIR}/uw-imaps.xinetd imaps
+}