From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- net-libs/c-client/Manifest | 2 +- net-libs/c-client/c-client-2007f-r6.ebuild | 156 ---------------------------- net-libs/c-client/c-client-2007f-r7.ebuild | 159 +++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 157 deletions(-) delete mode 100644 net-libs/c-client/c-client-2007f-r6.ebuild create mode 100644 net-libs/c-client/c-client-2007f-r7.ebuild (limited to 'net-libs/c-client') diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest index 4cd234214240..2be62b6ab6aa 100644 --- a/net-libs/c-client/Manifest +++ b/net-libs/c-client/Manifest @@ -5,5 +5,5 @@ AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae -EBUILD c-client-2007f-r6.ebuild 4516 BLAKE2B 5b07b16a823e11919ab5a0a6e60224b0c1840924f13d4a5a15cae42dddfae7c2b20711b7c0968b64e75cf60eb3cc0b6df99405abaebc7fd5d7623ab27ba8b095 SHA512 dd29dfc15736c5e4146eed8722cdad59db64871d060c1938c4b6c444b3a3ed412aa144d7a3f3e15c32997258382e52d39d67beb1f1f3ab0f757cd2e27cfc8608 +EBUILD c-client-2007f-r7.ebuild 4549 BLAKE2B 443ae180f157b7bbc06728b03628b0548e839b595d65d6934a812fdb457f510924602ddde7e0fd9a8a6f30885cbc2b6d004bf584f76f16c63e5e67ce179d6868 SHA512 915e84e19b1480fc187deb6f66fa32cd8209d737f45cbc2d46eda0dc37e121860f77b07fae0bc5bf559ff4ae88d8c21aea2cebeb9fb47c81d40ea81fd40dff32 MISC metadata.xml 480 BLAKE2B 1e688b1b8c76882dfbce8625873104438c89652149a9a14069d8692a469101fb7cf4036151e42f888558d8eb4062817f9481e9552b4882bd285f1c73ed821364 SHA512 b59bb7820763cb1c5dab4b0166fafc424fa76aa24465c44c7314ca8ed0b0f0b4d5066fca335cad963d5c4737be1b1d02ff929f0b2a5c5d234728669ddb5379a9 diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild deleted file mode 100644 index 659b62e505a6..000000000000 --- a/net-libs/c-client/c-client-2007f-r6.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic libtool toolchain-funcs - -MY_PN=imap -MY_P="${MY_PN}-${PV}" -S=${WORKDIR}/${MY_P} - -CHAPPA_PL=115 -DESCRIPTION="UW IMAP c-client library" -HOMEPAGE="http://www.washington.edu/imap/" -SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z - chappa? ( mirror://gentoo/${P}-chappa-${CHAPPA_PL}-all.patch.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) - !net-mail/uw-imap - kerberos? ( app-crypt/mit-krb5 ) -" -DEPEND="${RDEPEND} - kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) ) -" - -PATCHES=( - # Apply a patch to only build the stuff we need for c-client - "${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch" - - # Apply patch to add the compilation of a .so for PHP - # This was previously conditional, but is more widely useful. - "${FILESDIR}/${PN}-2006k_GENTOO_amd64-so-fix.patch" - - # Respect LDFLAGS - "${FILESDIR}/${PN}-2007f-ldflags.patch" - - # openssl-1.1 build fix #647616 - "${FILESDIR}/${PN}-2007f-openssl-1.1.patch" -) - -src_prepare() { - use topal && PATCHES+=( "${FILESDIR}/${P}-topal.patch" ) - - default - - use chappa && eapply -p2 "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch" - - # Tarball packed with bad file perms - chmod -R u+rwX,go-w . || die "failed to fix permissions" - - # lots of things need -fPIC, including various platforms, and this library - # generally should be built with it anyway. - append-flags -fPIC - - # Modifications so we can build it optimally and correctly - 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' \ - -i src/osdep/unix/Makefile \ - || die "failed to fix compiler flags and SSL paths in the Makefile" - - # Make the build system more multilib aware - sed \ - -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \ - -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \ - -i src/osdep/unix/Makefile \ - || die "failed to fix our libdir in the Makefile" - - # Targets should use the Gentoo (ie linux) fs - sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \ - -i src/osdep/unix/Makefile \ - || die "failed to fix the FreeBSD ACTIVEFILE path in the Makefile" - - # Remove the pesky checks about SSL stuff - sed -e '/read.*exit/d' -i Makefile \ - || die "failed to disable SSL warning in the Makefile" - - sed -e "s:CC=cc:CC=$(tc-getCC):" \ - -e "s:ARRC=ar:ARRC=$(tc-getAR):" \ - -e "s:RANLIB=ranlib:RANLIB=$(tc-getRANLIB):" \ - -i src/osdep/unix/Makefile \ - || die "failed to fix build flags support in the Makefile" - - elibtoolize -} - -src_compile() { - local mymake ipver ssltype target passwdtype - ipver='IP=4' - if use ipv6 ; then - ipver="IP=6" - touch ip6 || die "failed to create ip6 file" - fi - use ssl && ssltype="unix" || ssltype="none" - if use kernel_linux ; then - # Fall back to "slx" when USE=pam is not set. This ensures that - # we link in libcrypt to get the crypt() routine (bug #456928). - use pam && target=lnp passwdtype=pam || target=slx passwdtype=std - elif use kernel_FreeBSD ; then - target=bsf passwdtype=pam - fi - use kerberos \ - && mymake="EXTRAAUTHENTICATORS=gss" \ - && EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - # no parallel builds supported! - emake -j1 SSLTYPE=${ssltype} $target \ - PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \ - EXTRACFLAGS="${CFLAGS}" \ - EXTRALDFLAGS="${LDFLAGS}" \ - EXTRALIBS="${EXTRALIBS}" \ - GSSDIR=/usr -} - -src_install() { - if use static-libs; then - # Library binary - dolib.a c-client/c-client.a - dosym c-client.a "/usr/$(get_libdir)/libc-client.a" - fi - - # Now the shared library - dolib.so c-client/libc-client.so.1.0.0 - - dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so" - dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so.1" - - # Headers - insinto /usr/include/imap - doins src/osdep/unix/*.h - doins src/c-client/*.h - doins c-client/linkage.h - doins c-client/linkage.c - doins c-client/osdep.h - - if use ssl; then - echo " ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c \ - || die "failed to add ssl init statement to linkage.c" - fi - - # Documentation - dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD - if use doc; then - docinto rfc - dodoc docs/rfc/*.txt - docinto draft - dodoc docs/draft/* - fi -} diff --git a/net-libs/c-client/c-client-2007f-r7.ebuild b/net-libs/c-client/c-client-2007f-r7.ebuild new file mode 100644 index 000000000000..afa0c1cd8f11 --- /dev/null +++ b/net-libs/c-client/c-client-2007f-r7.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic libtool toolchain-funcs + +MY_PN=imap +MY_P="${MY_PN}-${PV}" +S=${WORKDIR}/${MY_P} + +CHAPPA_PL=115 +DESCRIPTION="UW IMAP c-client library" +HOMEPAGE="http://www.washington.edu/imap/" +SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z + chappa? ( mirror://gentoo/${P}-chappa-${CHAPPA_PL}-all.patch.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa" + +RDEPEND=" + !net-mail/uw-imap + ssl? ( + dev-libs/openssl:0= + ) + kernel_linux? ( + pam? ( >=sys-libs/pam-0.72 ) + !pam? ( virtual/libcrypt:= ) + ) + kerberos? ( app-crypt/mit-krb5 ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + # Apply a patch to only build the stuff we need for c-client + "${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch" + + # Apply patch to add the compilation of a .so for PHP + # This was previously conditional, but is more widely useful. + "${FILESDIR}/${PN}-2006k_GENTOO_amd64-so-fix.patch" + + # Respect LDFLAGS + "${FILESDIR}/${PN}-2007f-ldflags.patch" + + # openssl-1.1 build fix #647616 + "${FILESDIR}/${PN}-2007f-openssl-1.1.patch" +) + +src_prepare() { + use topal && PATCHES+=( "${FILESDIR}/${P}-topal.patch" ) + + default + + use chappa && eapply -p2 "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch" + + # Tarball packed with bad file perms + chmod -R u+rwX,go-w . || die "failed to fix permissions" + + # lots of things need -fPIC, including various platforms, and this library + # generally should be built with it anyway. + append-flags -fPIC + + # Modifications so we can build it optimally and correctly + 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' \ + -i src/osdep/unix/Makefile \ + || die "failed to fix compiler flags and SSL paths in the Makefile" + + # Make the build system more multilib aware + sed \ + -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \ + -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \ + -i src/osdep/unix/Makefile \ + || die "failed to fix our libdir in the Makefile" + + # Targets should use the Gentoo (ie linux) fs + sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \ + -i src/osdep/unix/Makefile \ + || die "failed to fix the FreeBSD ACTIVEFILE path in the Makefile" + + # Remove the pesky checks about SSL stuff + sed -e '/read.*exit/d' -i Makefile \ + || die "failed to disable SSL warning in the Makefile" + + sed -e "s:CC=cc:CC=$(tc-getCC):" \ + -e "s:ARRC=ar:ARRC=$(tc-getAR):" \ + -e "s:RANLIB=ranlib:RANLIB=$(tc-getRANLIB):" \ + -i src/osdep/unix/Makefile \ + || die "failed to fix build flags support in the Makefile" + + elibtoolize +} + +src_compile() { + local mymake ipver ssltype target passwdtype + ipver='IP=4' + if use ipv6 ; then + ipver="IP=6" + touch ip6 || die "failed to create ip6 file" + fi + use ssl && ssltype="unix" || ssltype="none" + if use kernel_linux ; then + # Fall back to "slx" when USE=pam is not set. This ensures that + # we link in libcrypt to get the crypt() routine (bug #456928). + use pam && target=lnp passwdtype=pam || target=slx passwdtype=std + elif use kernel_FreeBSD ; then + target=bsf passwdtype=pam + fi + use kerberos \ + && mymake="EXTRAAUTHENTICATORS=gss" \ + && EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ + # no parallel builds supported! + emake -j1 SSLTYPE=${ssltype} $target \ + PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \ + EXTRACFLAGS="${CFLAGS}" \ + EXTRALDFLAGS="${LDFLAGS}" \ + EXTRALIBS="${EXTRALIBS}" \ + GSSDIR=/usr +} + +src_install() { + if use static-libs; then + # Library binary + dolib.a c-client/c-client.a + dosym c-client.a "/usr/$(get_libdir)/libc-client.a" + fi + + # Now the shared library + dolib.so c-client/libc-client.so.1.0.0 + + dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so" + dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so.1" + + # Headers + insinto /usr/include/imap + doins src/osdep/unix/*.h + doins src/c-client/*.h + doins c-client/linkage.h + doins c-client/linkage.c + doins c-client/osdep.h + + if use ssl; then + echo " ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c \ + || die "failed to add ssl init statement to linkage.c" + fi + + # Documentation + dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD + if use doc; then + docinto rfc + dodoc docs/rfc/*.txt + docinto draft + dodoc docs/draft/* + fi +} -- cgit v1.2.3