diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /mail-client/nail | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'mail-client/nail')
-rw-r--r-- | mail-client/nail/Manifest | 5 | ||||
-rw-r--r-- | mail-client/nail/files/nail-12.4-debian.patch | 56 | ||||
-rw-r--r-- | mail-client/nail/files/nail-12.4-openssl-1.patch | 72 | ||||
-rw-r--r-- | mail-client/nail/metadata.xml | 23 | ||||
-rw-r--r-- | mail-client/nail/nail-12.4-r3.ebuild | 109 |
5 files changed, 0 insertions, 265 deletions
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest deleted file mode 100644 index 1e8c905509c8..000000000000 --- a/mail-client/nail/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX nail-12.4-debian.patch 1060 BLAKE2B dc07866c7871391e9bbddecfb5bb5addec4cffc16b93f03d0b6288a4fb95fdc546813ee16dd7a3eb3a03ded2c6889fe3c3e5a9b5fc8414d53b53079f17642ca4 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513 -AUX nail-12.4-openssl-1.patch 1860 BLAKE2B e91b6a9f334060c6393aaa20120c0ce21bc6048c24aa097d57fd4eb73300ce864d6631e0b3a1202c43a9baab1bc11873e21d91f12d0478f8e81649ca9337bb6c SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca -DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 -EBUILD nail-12.4-r3.ebuild 2431 BLAKE2B ca5556e0e56597904b4315aadaff3a66df315c0c2f48ca69ccade567241982ba13e3931dba39f16768feef741aa9b0487545d1ad1e656ddaa8c3f2ab692b9bed SHA512 abfd5dceda88571f26a8ae6c79739f4e270e600f8f5b5429b532c0ed84e85fddf2a2e809ea18858c3ed85ed49f7a34b7dae1389414fdd5bc81def832faedf958 -MISC metadata.xml 825 BLAKE2B eb7f1456cf87589b72e315514f84892714f7a5bb64818e6df16bfe4e1a90149e4d991930fc75a61dc14c93d21c0da5db9d817842a87f106a8af6ba43a4107293 SHA512 8fdd54add3b24141018d95ba7e178afde536c363a21df40bd90064f9b91af0973454055100edbfe2a2cc06f3f8267b6d13ca67236c75bafc51b58a225f9ebc41 diff --git a/mail-client/nail/files/nail-12.4-debian.patch b/mail-client/nail/files/nail-12.4-debian.patch deleted file mode 100644 index 2fea0b190d29..000000000000 --- a/mail-client/nail/files/nail-12.4-debian.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- heirloom-mailx-12.4.orig/getopt.c -+++ heirloom-mailx-12.4/getopt.c -@@ -43,7 +43,7 @@ - char *optarg; - int optind = 1; - int opterr = 1; --int optopt; -+int optoptc; - - static void - error(const char *s, int c) -@@ -69,7 +69,7 @@ - *bp++ = *s++; - while (*msg) - *bp++ = *msg++; -- *bp++ = optopt; -+ *bp++ = optoptc; - *bp++ = '\n'; - write(2, buf, bp - buf); - ac_free(buf); -@@ -101,13 +101,13 @@ - } - curp = &argv[optind][1]; - } -- optopt = curp[0] & 0377; -+ optoptc = curp[0] & 0377; - while (optstring[0]) { - if (optstring[0] == ':') { - optstring++; - continue; - } -- if ((optstring[0] & 0377) == optopt) { -+ if ((optstring[0] & 0377) == optoptc) { - if (optstring[1] == ':') { - if (curp[1] != '\0') { - optarg = (char *)&curp[1]; -@@ -127,7 +127,7 @@ - optind++; - optarg = 0; - } -- return optopt; -+ return optoptc; - } - optstring++; - } ---- heirloom-mailx-12.4.orig/mailx.1 -+++ heirloom-mailx-12.4/mailx.1 -@@ -3766,7 +3766,7 @@ - .sp - .fi - which might cause --.N mailx -+.B mailx - to respond with, for example: - .nf - .sp diff --git a/mail-client/nail/files/nail-12.4-openssl-1.patch b/mail-client/nail/files/nail-12.4-openssl-1.patch deleted file mode 100644 index 376c4d668e36..000000000000 --- a/mail-client/nail/files/nail-12.4-openssl-1.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://bugs.gentoo.org/328363 -http://repos.archlinux.org/wsvn/community/mailx-heirloom/trunk/mailx-heirloom-openssl-1.0.patch - ---- openssl.c -+++ openssl.c -@@ -105,7 +105,7 @@ - static void ssl_load_verifications(struct sock *sp); - static void ssl_certificate(struct sock *sp, const char *uhp); - static enum okay ssl_check_host(const char *server, struct sock *sp); --static int smime_verify(struct message *m, int n, STACK *chain, -+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain, - X509_STORE *store); - static EVP_CIPHER *smime_cipher(const char *name); - static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata); -@@ -308,7 +308,7 @@ - X509 *cert; - X509_NAME *subj; - char data[256]; -- /*GENERAL_NAMES*/STACK *gens; -+ /*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES) *gens; - GENERAL_NAME *gen; - int i; - -@@ -496,7 +496,7 @@ - } - - static int --smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store) -+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store) - { - struct message *x; - char *cp, *sender, *to, *cc, *cnttype; -@@ -505,7 +505,8 @@ - off_t size; - BIO *fb, *pb; - PKCS7 *pkcs7; -- STACK *certs, *gens; -+ STACK_OF(X509) *certs; -+ STACK_OF(GENERAL_NAMES) *gens; - X509 *cert; - X509_NAME *subj; - char data[LINESIZE]; -@@ -614,7 +615,7 @@ - { - int *msgvec = vp, *ip; - int ec = 0; -- STACK *chain = NULL; -+ STACK_OF(X509) *chain = NULL; - X509_STORE *store; - char *ca_dir, *ca_file; - -@@ -687,7 +688,7 @@ - X509 *cert; - PKCS7 *pkcs7; - BIO *bb, *yb; -- STACK *certs; -+ STACK_OF(X509) *certs; - EVP_CIPHER *cipher; - - certfile = expand((char *)certfile); -@@ -950,9 +951,9 @@ - off_t size; - BIO *fb, *pb; - PKCS7 *pkcs7; -- STACK *certs; -+ STACK_OF(X509) *certs; - X509 *cert; -- STACK *chain = NULL; -+ STACK_OF(X509) *chain = NULL; - enum okay ok = OKAY; - - message_number = n; diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml deleted file mode 100644 index 438edf383cb0..000000000000 --- a/mail-client/nail/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="net"> - Enable support for network protocols (POP, IMAP and SMTP). If you - only need to send mail with the local Transport Agent, disabling - this will get you support for only /usr/sbin/sendmail call. - </flag> - <flag name="ssl"> - If network is enabled, this adds support for S/MIME and - SSL/TLS-powered protocols through <pkg>dev-libs/openssl</pkg>. - </flag> - <flag name="kerberos"> - If network is enabled, this adds support for GSSAPI login on IMAP - through <pkg>virtual/krb5</pkg>. - </flag> - </use> - <upstream> - <remote-id type="sourceforge">heirloom</remote-id> - </upstream> -</pkgmetadata> diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild deleted file mode 100644 index 6cd0f0c264bf..000000000000 --- a/mail-client/nail/nail-12.4-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs - -HOMEPAGE="http://heirloom.sourceforge.net/" -DESCRIPTION="an enhanced mailx-compatible mail client" -LICENSE="BSD" - -MY_PN="mailx" -MY_P="${MY_PN}-${PV}" -SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="libressl ssl net kerberos" - -RDEPEND=" - net? ( - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - kerberos? ( virtual/krb5 ) - ) - !mail-client/mailx - !net-mail/mailutils -" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -undef() { - sed -i -e "/$1/s:#define:#undef:" config.h || die -} - -droplib() { - sed -i -e "/$1/s:^:#:" LIBS || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-debian.patch \ - "${FILESDIR}"/${P}-openssl-1.patch - # Do not strip the binary - sed -i -e '/STRIP/d' Makefile -} - -src_configure() { - # Build config.h and LIBS, neccesary to tweak the config - # use -j1 because it will produce bogus output otherwise - emake -j1 config.h LIBS || die - - # Logic to 'configure' the package - - if ! use ssl || ! use net ; then - undef 'USE_\(OPEN\)\?SSL' - droplib -lssl - fi - - if ! use kerberos || ! use net ; then - undef 'USE_GSSAPI' - droplib -lgssapi_krb5 - fi - - if ! use net ; then - undef 'HAVE_SOCKETS' - fi -} - -src_compile() { - # No configure script to check for and set this - tc-export CC - - emake \ - CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \ - PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \ - SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \ - MAILSPOOL='/var/spool/mail' \ - || die "emake failed" -} - -src_install () { - # Use /usr/sbin/sendmail by default and provide an example - cat <<- EOSMTP >> nail.rc - - # Use the local sendmail (/usr/sbin/sendmail) binary by default. - # (Uncomment the following line to use a SMTP server) - #set smtp=localhost - - # Ask for CC: list too. - set askcc - EOSMTP - - emake DESTDIR="${D}" \ - UCBINSTALL=$(type -p install) \ - PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \ - || die - - dodoc AUTHORS README || die - - dodir /bin - dosym ../usr/bin/mailx /bin/mail || die - dosym mailx /usr/bin/mail || die - dosym mailx /usr/bin/Mail || die - - dosym mailx.1 /usr/share/man/man1/mail.1 || die - dosym mailx.1 /usr/share/man/man1/Mail.1 || die -} |