diff options
Diffstat (limited to 'mail-client/alpine')
| -rw-r--r-- | mail-client/alpine/Manifest | 14 | ||||
| -rw-r--r-- | mail-client/alpine/alpine-2.00-r7.ebuild | 108 | ||||
| -rw-r--r-- | mail-client/alpine/alpine-2.22.ebuild (renamed from mail-client/alpine/alpine-2.21.1.ebuild) | 53 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-c-client.patch | 251 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-lcrypto.patch | 12 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-lpam.patch | 13 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-qa-chappa-115.patch | 40 | ||||
| -rw-r--r-- | mail-client/alpine/files/2.00-qa.patch | 19 | ||||
| -rw-r--r-- | mail-client/alpine/metadata.xml | 2 |
9 files changed, 28 insertions, 484 deletions
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest index 459e083dde12..144abdf32ed8 100644 --- a/mail-client/alpine/Manifest +++ b/mail-client/alpine/Manifest @@ -1,15 +1,7 @@ -AUX 2.00-c-client.patch 6320 BLAKE2B d32862cc92d299f580a9ce1e8d19230da2b5d26f961cd171fa77d01aac620a6342db1b39238e82e0090e665d6387bd623fea9389cfa8e9620fcc33723a43124c SHA512 123eb7d6310cba4908b90393e56bd9cc398ee40289fd328a3bc6b9ae37059cf73540cd9cdd2b16b0210555a696d501016b8e6b201e2c13738088a1d3728f5fb7 -AUX 2.00-lcrypto.patch 496 BLAKE2B 915c0c1d423ee2b78f366186ef0eb696f795561e3bd11ec01c2a260123dc9666f1b17996f1b4f6454aac5dbe59fefb7635a3f4920ead79b09c88090fcc48b7f0 SHA512 1d90950a3066f29cedf225283e58ac007deb0db4507000e05fc3ccf5ebbfcef6af076f04d4e0da5ec0f47cea823e651eae3ab1315efec5373245515cf1e640ea -AUX 2.00-lpam.patch 295 BLAKE2B cc624474e6f283becb65cdaa903123f658b23d18c1d1208a1b18636fed0306a812ec4613eba5c18a8d920ab6ddfd51d850b01d2e13925e7a6af949bb30413403 SHA512 5705c7736797b38c80a2b1bd96f283b00a06ea7b00868c0470cd4a33408aa00a49c5cbba986bf6f3d4d0d84d220f4ae0191003914b0e0651fead785068140d5a -AUX 2.00-qa-chappa-115.patch 1312 BLAKE2B a73fe10eeeac3dd651ebd6ce72a1321d73da2fd1543dfcd4749a08c8033b74f4d35db41166afd11c133cbb42cd39d72fb9240e539abc3c1c68e2e8b583672d96 SHA512 ec6720bffdba5b853f696720ef9a74b13901ec918648c97170dce3ae8be4c2f1dc6de124662b1a9d9e08f7c626688aae81456f5afb6131594a427edc9de7c56b -AUX 2.00-qa.patch 409 BLAKE2B 2d74c9835079a8b62721f58d21c10071b69d9c3821ad5ecaa5397b791ba4ded5a68e08f2da23088a27654cc4a63c8b59631a297e139c8ddb98624e6bcfbeb049 SHA512 4c9107fe2db7688f925054b31748fc10db5c445fda5177babbee2fe543c834658f4b65ea3b4e18259acb809755bf4fa2408f47ee379d6006554ee7556b334a26 AUX alpine-2.21.1-nopam.patch 704 BLAKE2B 2a388b75246de1282686d3b229ea2841a930eeef3c9080303e544c9430c34546c179e8a4b0f6b700f3f532a10a203929047922c5ad6e918537011df5c9bd1cdd SHA512 4c5690a96137c303350ef515f3f382160b4045612df8c1ad63a7b72de040f13e33c8aa21e34858d8b33124c4f58dd7a19edcd40c8f49b95e9bbb0746973bcf46 -DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb54947868b31f0e65eef0e35e515d14d9a701e5809fa1a7191444a353de3ba08b821bdf71543faaf261d4a427c2d1e366bbc00d4bf337 SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7 -DIST alpine-2.00.tar.bz2 5222673 BLAKE2B 38a9cd1fe3e291119b889bca0d304333cdf9ad8c63bc7923ea0735d3528c933b7d4dfe70bb353fe7b6047dafdaee3218a35e561f542b6ac763b60cb986509371 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 -DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7 +DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1 DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e1813672aec537fd05d5ff90b67bec145ceef71cfcf35b0cb7e250bb307556f5dcf8ebb024bc6366fd0ace0a7c41161 SHA512 106caa7bfe86fd5e82554ba68b9ee579cd8495bcd0dfbf82d9d75da2df3bd292d42d67af8ec737091f2a820b2555c25bbf0058c9c7bb5de5f950b570ffc25c4d -EBUILD alpine-2.00-r7.ebuild 2680 BLAKE2B 8220e2aa1a2850aff527bc81c0b4a623b83407aa93d612bc4972893b81d1b26d1d477ef8a0b59abafa27d618b82ad76efb35c130bff4ecda9c6cfd771e9e5061 SHA512 5efc56179e0da112d32082806a869e2527580a4d40d03be8dcfe6b37c900fc0b95f0388c716f2e6d85b0aa6c054ed75afaef80ede417031c7fca1698d26f65da EBUILD alpine-2.21.1-r1.ebuild 2235 BLAKE2B 5dcc7a462c981e29b1d00d8df5d0c73b44fa18dfb8be9e75ca07d027dbcf5d78c839bcfb7809dfd4e2adf0c7c6a27d51bfda4adf74bd2f1b3ecb75658497d086 SHA512 e47d31105895b50b758fbd8d9888fd66b7db0ba2f5c564e04bf368caf5cc14c3e25d3f66d364bcfe731ec9158c0b2c28b24bd9fe7d49f466eb83660e1a7d7bf7 EBUILD alpine-2.21.1-r2.ebuild 2218 BLAKE2B 4bcd38548dfec570422978a2b6ad3db07ad7f1738b066f03c8ea6fa265741971844dbf73a8630e2b5f70a88b00c305b77e985c1c8aa27bdcd984d142d27f7b86 SHA512 2a1d67cddee558988a19a16c2726101ebefc37b9f5287e45d4c7c8ea6d8f06ec862a37fb4806590b8b51d94fc30e0f6a6961fe88a768bf4ed7c867b618530ae9 -EBUILD alpine-2.21.1.ebuild 1996 BLAKE2B 06531876a0e78e697f5493d115dbbca63c0ff76ff0fd0cc6fbdf3e7ed8d6ab051a1869b4850cc51e5cfe53ea2294827286a47b70c0fdb8c26f1b22c3ce4261db SHA512 1be41b58ce9ad7d741eabe5b355cda4c32ff1b2faac73ba11fb8b4d5f278895789b9687723f288dee594ba2805d78539460470e22b5e227b9fefe18b9df9eb14 -MISC metadata.xml 731 BLAKE2B 56450ee7efb0663450b32b746f06718440e8b722ed72ad7b7ae5d3f100bf4930bcac1d3aa5bc198bfff6081da220020dcda7ef857409313cb050a51d6f6099cc SHA512 27adca82690095f965b98b31fb175f4215f4585ad8144fab2d3f519f2c6edc77b92f1f335ef832d0bfa99b31713e3064717e8cab75880eb44aada9fed49aaab9 +EBUILD alpine-2.22.ebuild 1958 BLAKE2B c42e7bfc13f865abbbd2ab8aa0568746acf1b7df06c422ee7346fae623a96f95d14d7f08994dbaa7ac5c551618b3e72c1910f5b5990248d3f0478e2f4f943ef8 SHA512 c894531026c73cdd8a1124711cf6fb8928c979aa793541ba18a7454596ad70cdae07cc20a111d3ef819d624ab5b45f0689d71fbb1f3261a3375c0c313f27a66b +MISC metadata.xml 647 BLAKE2B 4086af8d509f84060de872fb72550c418d9b73883474ee873192540e0e05a2cc0fb9792c727137edcc08c3d16ed0af7964d5dc5dd82a58adcc85198e9862453c SHA512 d4a2cb5a4519c12cb75441e7418c34d96b320281d503f9ff2ce94050a88e2d5ac476ccb46c325ca35d459c0bf1c56932755cb7b919d27ea253c13f4b40d035ce diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild deleted file mode 100644 index 138fdc96cddc..000000000000 --- a/mail-client/alpine/alpine-2.00-r7.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic autotools multilib toolchain-funcs - -CHAPPA_PL=115 -DESCRIPTION="An easy to use text-based based mail and news client" -HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/" -SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2 - chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz - -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" -IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads +chappa" - -DEPEND="sys-libs/pam - >=net-libs/c-client-2007f-r4[chappa=] - >=sys-libs/ncurses-5.1:0= - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ldap? ( net-nds/openldap ) - kerberos? ( app-crypt/mit-krb5 ) - spell? ( app-text/aspell ) -" -RDEPEND="${DEPEND} - app-misc/mime-types - !onlyalpine? ( !mail-client/pine ) - !<=net-mail/uw-imap-2004g -" - -src_prepare() { - default - use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz" - - # do not use the bundled c-client - ebegin "Unbundling the c-client library" - rm -rf "${S}"/imap - local f - while read f ; do - sed -i -e \ - 's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include <imap/\1>~g' "$f" - done < <(find "${S}" -name "*.c" -o -name "*.h") - eend $? - - epatch "${FILESDIR}"/2.00-lpam.patch - epatch "${FILESDIR}"/2.00-lcrypto.patch - epatch "${FILESDIR}"/2.00-c-client.patch - epatch "${FILESDIR}"/2.00-qa.patch - use chappa && epatch "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch" - - eautoreconf -} - -src_configure() { - local myconf="--without-tcl - --with-system-pinerc=/etc/pine.conf - --with-system-fixed-pinerc=/etc/pine.conf.fixed" - #--disable-debug" - # fixme - # --with-system-mail-directory=DIR? - - if use ssl; then - myconf+=" --with-ssl - --with-ssl-include-dir=/usr - --with-ssl-lib-dir=/usr/$(get_libdir) - --with-ssl-certs-dir=/etc/ssl/certs" - else - myconf+="--without-ssl" - fi - econf \ - $(use_with ldap) \ - $(use_with passfile passfile .pinepwd) \ - $(use_with kerberos krb5) \ - $(use_with threads pthread) \ - $(use_with spell interactive-spellcheck /usr/bin/aspell) \ - $(use_enable nls) \ - $(use_with ipv6) \ - $(use_with smime) \ - ${myconf} -} - -src_compile() { - emake AR=$(tc-getAR) -} - -src_install() { - if use onlyalpine ; then - dobin alpine/alpine - doman doc/alpine.1 - else - emake DESTDIR="${D}" install - doman doc/rpdump.1 doc/rpload.1 - fi - - dodoc NOTICE README* - - if use doc ; then - dodoc doc/brochure.txt doc/tech-notes.txt - - docinto html/tech-notes - dohtml -r doc/tech-notes/ - fi -} diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.22.ebuild index e8f94db8e4d6..75f6d6673383 100644 --- a/mail-client/alpine/alpine-2.21.1.ebuild +++ b/mail-client/alpine/alpine-2.22.ebuild @@ -1,33 +1,30 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools toolchain-funcs vcs-snapshot +EAPI=7 + +inherit autotools toolchain-funcs DESCRIPTION="An easy to use text-based based mail and news client" HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/" -GIT_COMMIT="672d6838a9babf2faeb9f79267525a4ab9d20b14" -SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads" -DEPEND="sys-libs/pam - >=sys-libs/ncurses-5.1:0= +DEPEND=">=sys-libs/ncurses-5.1:0= + kerberos? ( app-crypt/mit-krb5 ) + ldap? ( net-nds/openldap ) + spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - ldap? ( net-nds/openldap ) - kerberos? ( app-crypt/mit-krb5 ) - spell? ( app-text/aspell ) " RDEPEND="${DEPEND} app-misc/mime-types - !onlyalpine? ( !mail-client/pine ) - !<=net-mail/uw-imap-2004g " src_prepare() { @@ -40,6 +37,15 @@ src_configure() { --without-tcl --with-system-pinerc="${EPREFIX}"/etc/pine.conf --with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed + $(use_with ldap) + $(use_with ssl) + $(use_with passfile passfile .pinepwd) + $(use_with kerberos krb5) + $(use_with threads pthread) + $(use_with spell interactive-spellcheck /usr/bin/aspell) + $(use_enable nls) + $(use_with ipv6) + $(use_with smime) ) if use ssl; then @@ -49,21 +55,11 @@ src_configure() { --with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs ) fi - econf \ - $(use_with ldap) \ - $(use_with ssl) \ - $(use_with passfile passfile .pinepwd) \ - $(use_with kerberos krb5) \ - $(use_with threads pthread) \ - $(use_with spell interactive-spellcheck /usr/bin/aspell) \ - $(use_enable nls) \ - $(use_with ipv6) \ - $(use_with smime) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_compile() { - emake AR=$(tc-getAR) + emake -j1 AR=$(tc-getAR) } src_install() { @@ -71,7 +67,7 @@ src_install() { dobin alpine/alpine doman doc/man1/alpine.1 else - emake DESTDIR="${D}" install + emake -j1 DESTDIR="${D}" install doman doc/man1/*.1 fi @@ -80,8 +76,9 @@ src_install() { if use doc ; then dodoc doc/brochure.txt - docinto html/tech-notes - dodoc -r doc/tech-notes/*.html - dodoc -r doc/tech-notes/*.txt + dodoc -r doc/tech-notes/ + newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample + newdoc "${S}/doc/mime.types" mime.types.sample + docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample fi } diff --git a/mail-client/alpine/files/2.00-c-client.patch b/mail-client/alpine/files/2.00-c-client.patch deleted file mode 100644 index b3b33bcc455e..000000000000 --- a/mail-client/alpine/files/2.00-c-client.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- Makefile.am 2012-10-10 12:30:39.442107211 +0000 -+++ Makefile.am 2012-10-10 12:31:17.235528699 +0000 -@@ -16,7 +16,7 @@ - - SUBDIRS = m4 po $(REGEX_BUILD) pith pico alpine $(WEB_PUBCOOKIE_BUILD) $(WEB_BUILD) - --BUILT_SOURCES = c-client.d c-client $(WEB_PUBCOOKIE_LINK) -+BUILT_SOURCES = $(WEB_PUBCOOKIE_LINK) - - CLEANFILES = c-client - -@@ -38,3 +38,4 @@ - man_MANS = doc/alpine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 - - ACLOCAL_AMFLAGS = -I m4 -+AM_LDFLAGS = -lc-client ---- pico/Makefile.am 2012-10-10 13:01:06.851900583 +0000 -+++ pico/Makefile.am 2012-10-10 13:07:40.960017458 +0000 -@@ -24,8 +24,9 @@ - - pilot_LDADD = $(LDADD) $(INTLLIBS) - --LDADD = ../c-client/utf8.o libpico.a osdep/libpicoosd.a \ -+LDADD = libpico.a osdep/libpicoosd.a \ - ../pith/osdep/libpithosd.a ../pith/charconv/libpithcc.a -+AM_LDFLAGS = -lc-client - - noinst_LIBRARIES = libpico.a - -diff --git a/alpine/callbacks.c b/alpine/callbacks.c -new file mode 100644 -index 0000000..e92beb5 ---- /dev/null -+++ alpine/callbacks.c -@@ -0,0 +1,184 @@ -+/* ======================================================================== -+ * Copyright 1988-2007 University of Washington -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * -+ * ======================================================================== -+ */ -+ -+#include <stdio.h> -+#include <signal.h> -+#include <imap/c-client.h> -+ -+/* Excellent reasons to hate ifdefs, and why my real code never uses them */ -+ -+#ifndef unix -+# define unix 0 -+#endif -+ -+#if unix -+# define UNIXLIKE 1 -+# define MACOS 0 -+# include <pwd.h> -+#else -+# define UNIXLIKE 0 -+# ifdef noErr -+# define MACOS 1 -+# include <Memory.h> -+# else -+# define MACOS 0 -+# endif -+#endif -+ -+char *curhst = NIL; /* currently connected host */ -+char *curusr = NIL; /* current login user */ -+ -+ -+/* Interfaces to C-client */ -+ -+ -+void mm_searched (MAILSTREAM *stream,unsigned long number) -+{ -+} -+ -+ -+void mm_exists (MAILSTREAM *stream,unsigned long number) -+{ -+} -+ -+ -+void mm_expunged (MAILSTREAM *stream,unsigned long number) -+{ -+} -+ -+ -+void mm_flags (MAILSTREAM *stream,unsigned long number) -+{ -+} -+ -+ -+void mm_notify (MAILSTREAM *stream,char *string,long errflg) -+{ -+ mm_log (string,errflg); -+} -+ -+ -+void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) -+{ -+ putchar (' '); -+ if (delimiter) putchar (delimiter); -+ else fputs ("NIL",stdout); -+ putchar (' '); -+ fputs (mailbox,stdout); -+ if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout); -+ if (attributes & LATT_NOSELECT) fputs (", no select",stdout); -+ if (attributes & LATT_MARKED) fputs (", marked",stdout); -+ if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout); -+ putchar ('\n'); -+} -+ -+ -+void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) -+{ -+ putchar (' '); -+ if (delimiter) putchar (delimiter); -+ else fputs ("NIL",stdout); -+ putchar (' '); -+ fputs (mailbox,stdout); -+ if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout); -+ if (attributes & LATT_NOSELECT) fputs (", no select",stdout); -+ if (attributes & LATT_MARKED) fputs (", marked",stdout); -+ if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout); -+ putchar ('\n'); -+} -+ -+ -+void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status) -+{ -+ printf (" Mailbox %s",mailbox); -+ if (status->flags & SA_MESSAGES) printf (", %lu messages",status->messages); -+ if (status->flags & SA_RECENT) printf (", %lu recent",status->recent); -+ if (status->flags & SA_UNSEEN) printf (", %lu unseen",status->unseen); -+ if (status->flags & SA_UIDVALIDITY) printf (", %lu UID validity", -+ status->uidvalidity); -+ if (status->flags & SA_UIDNEXT) printf (", %lu next UID",status->uidnext); -+ printf ("\n"); -+} -+ -+ -+void mm_log (char *string,long errflg) -+{ -+ switch ((short) errflg) { -+ case NIL: -+ printf ("[%s]\n",string); -+ break; -+ case PARSE: -+ case WARN: -+ printf ("%%%s\n",string); -+ break; -+ case ERROR: -+ printf ("?%s\n",string); -+ break; -+ } -+} -+ -+ -+void mm_dlog (char *string) -+{ -+ puts (string); -+} -+ -+ -+void mm_login (NETMBX *mb,char *user,char *pwd,long trial) -+{ -+ char *s,tmp[MAILTMPLEN]; -+ if (curhst) fs_give ((void **) &curhst); -+ curhst = (char *) fs_get (1+strlen (mb->host)); -+ strcpy (curhst,mb->host); -+ sprintf (s = tmp,"{%s/%s",mb->host,mb->service); -+ if (*mb->user) sprintf (tmp+strlen (tmp),"/user=%s",strcpy (user,mb->user)); -+ if (*mb->authuser) sprintf (tmp+strlen (tmp),"/authuser=%s",mb->authuser); -+ if (*mb->user) strcat (s = tmp,"} password:"); -+ else { -+ printf ("%s} username: ",tmp); -+ fgets (user,NETMAXUSER-1,stdin); -+ user[NETMAXUSER-1] = '\0'; -+ if (s = strchr (user,'\n')) *s = '\0'; -+ s = "password: "; -+ } -+ if (curusr) fs_give ((void **) &curusr); -+ curusr = cpystr (user); -+ strcpy (pwd,getpass (s)); -+} -+ -+ -+void mm_critical (MAILSTREAM *stream) -+{ -+} -+ -+ -+void mm_nocritical (MAILSTREAM *stream) -+{ -+} -+ -+ -+long mm_diskerror (MAILSTREAM *stream,long errcode,long serious) -+{ -+#if UNIXLIKE -+ kill (getpid (),SIGSTOP); -+#else -+ abort (); -+#endif -+ return NIL; -+} -+ -+ -+void mm_fatal (char *string) -+{ -+ printf ("?%s\n",string); -+} -diff --git a/pico/Makefile.am b/pico/Makefile.am -index f5f694b..e782324 100644 ---- pico/Makefile.am -+++ pico/Makefile.am -@@ -16,9 +16,9 @@ SUBDIRS = osdep - - bin_PROGRAMS = pico pilot - --pico_SOURCES = main.c utf8stub.c -+pico_SOURCES = main.c utf8stub.c ../alpine/callbacks.c - --pilot_SOURCES = pilot.c utf8stub.c -+pilot_SOURCES = pilot.c utf8stub.c ../alpine/callbacks.c - - pico_LDADD = $(LDADD) $(INTLLIBS) - ---- alpine/Makefile.am 2012-10-11 07:53:35.749024355 +0000 -+++ alpine/Makefile.am 2012-10-11 07:54:15.931528157 +0000 -@@ -35,11 +35,11 @@ - LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ - ../pith/libpith.a ../pith/osdep/libpithosd.a \ - ../pith/charconv/libpithcc.a \ -- osdep/libpineosd.a ../c-client/c-client.a -+ osdep/libpineosd.a - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\" - --AM_LDFLAGS = `cat $(top_srcdir)/c-client/LDFLAGS` -+AM_LDFLAGS = -lc-client - - CLEANFILES = date.c - diff --git a/mail-client/alpine/files/2.00-lcrypto.patch b/mail-client/alpine/files/2.00-lcrypto.patch deleted file mode 100644 index b0601503fece..000000000000 --- a/mail-client/alpine/files/2.00-lcrypto.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp alpine-2.00.org/configure.ac alpine-2.00/configure.ac ---- alpine-2.00.org/configure.ac 2008-08-08 19:11:31.000000000 +0200 -+++ alpine-2.00/configure.ac 2011-11-24 12:01:47.741607522 +0100 -@@ -954,7 +954,7 @@ dnl provide SSL support? - if test "x$alpine_SSLTYPE" != "xnone" ; then - AC_SEARCH_LIBS(SSL_library_init,ssl, - [ -- LIBS="$LIBS -lssl" -+ LIBS="$LIBS -lcrypto" - ]) - if test "x$alpine_SSLTYPE" = "xnone" ; then - AC_MSG_NOTICE([OpenSSL libraries NOT found]) diff --git a/mail-client/alpine/files/2.00-lpam.patch b/mail-client/alpine/files/2.00-lpam.patch deleted file mode 100644 index 69e66d7efa07..000000000000 --- a/mail-client/alpine/files/2.00-lpam.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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@ diff --git a/mail-client/alpine/files/2.00-qa-chappa-115.patch b/mail-client/alpine/files/2.00-qa-chappa-115.patch deleted file mode 100644 index e13b80864730..000000000000 --- a/mail-client/alpine/files/2.00-qa-chappa-115.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- pith/send.c 2012-10-11 11:21:43.027665295 +0000 -+++ pith/send.c 2012-10-11 11:42:37.659237275 +0000 -@@ -48,6 +48,7 @@ - #include <imap/smtp.h> - #include <imap/nntp.h> - -+int maildir_file_path(char *name, char *tmp); - - /* this is used in pine_send and pine_simple_send */ - /* name::type::canedit::writehdr::localcopy::rcptto */ ---- pith/pattern.c 2012-10-11 11:21:48.069603095 +0000 -+++ pith/pattern.c 2012-10-11 11:44:19.868974380 +0000 -@@ -91,6 +91,7 @@ - ACTION_S *combine_inherited_role_guts(ACTION_S *); - int move_filtered_msgs(MAILSTREAM *, MSGNO_S *, char *, int, char *); - void set_some_flags(MAILSTREAM *, MSGNO_S *, long, char **, char **, int, char *); -+int maildir_file_path(char *name, char *tmp); - - - /* ---- pith/folder.c 2012-10-15 08:19:22.933383126 +0000 -+++ pith/folder.c 2012-10-15 08:19:06.314585696 +0000 -@@ -28,6 +28,7 @@ - #include "../pith/status.h" - #include "../pith/busy.h" - #include "../pith/mailindx.h" -+#include <imap/utf8aux.h> - - - typedef struct _build_folder_list_data { ---- pith/state.c 2012-10-15 08:31:20.378623246 +0000 -+++ pith/state.c 2012-10-15 08:38:07.089630169 +0000 -@@ -38,6 +38,7 @@ - * Globals referenced throughout pine... - */ - struct pine *ps_global; /* THE global variable! */ -+extern void free_allowed_qstr(void); - - #ifdef DEBUG - /* diff --git a/mail-client/alpine/files/2.00-qa.patch b/mail-client/alpine/files/2.00-qa.patch deleted file mode 100644 index da2535ef15cd..000000000000 --- a/mail-client/alpine/files/2.00-qa.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- pith/charconv/utf8.c 2012-10-11 07:57:38.022062458 +0000 -+++ pith/charconv/utf8.c 2012-10-11 08:59:56.205068504 +0000 -@@ -16,6 +16,8 @@ - */ - - -+#define _XOPEN_SOURCE -+ - /* includable WITHOUT dependency on c-client */ - #include <imap/mail.h> - #include <imap/utf8.h> -@@ -38,6 +40,7 @@ - #include "utf8.h" - - #include <stdarg.h> -+#include <wchar.h> - - - unsigned single_width_chars_a_to_b(UCS *, int, int); diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml index 777a30ec204d..155fe030ffa0 100644 --- a/mail-client/alpine/metadata.xml +++ b/mail-client/alpine/metadata.xml @@ -10,8 +10,6 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="chappa">enhance alpine by applying Eduardo Chappa's - patches</flag> <flag name="onlyalpine">installs only the alpine binary, so it does not collied with pico and/or pine</flag> <flag name="passfile">Adds support for caching passwords into a file |