* [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/
@ 2019-11-07 5:42 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2019-11-07 5:42 UTC (permalink / raw
To: gentoo-commits
commit: cdc9317f37aedfaf956f7f72ef46f73b97f31170
Author: Robert Siebeck <gentoo.2019 <AT> r123 <DOT> de>
AuthorDate: Sat Nov 17 18:27:32 2018 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 05:42:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc9317f
mail-client/alpine: make PAM optional
Closes: https://bugs.gentoo.org/617924
Signed-off-by: Robert Siebeck <gentoo.bugzilla.2012 <AT> r123.de>
Closes: https://github.com/gentoo/gentoo/pull/10645
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alpine/alpine-2.21.1-r2.ebuild | 95 ++++++++++++++++++++++
mail-client/alpine/files/alpine-2.21.1-nopam.patch | 27 ++++++
2 files changed, 122 insertions(+)
diff --git a/mail-client/alpine/alpine-2.21.1-r2.ebuild b/mail-client/alpine/alpine-2.21.1-r2.ebuild
new file mode 100644
index 00000000000..cd416868590
--- /dev/null
+++ b/mail-client/alpine/alpine-2.21.1-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+GIT_COMMIT="843b2f16abfd949e09b1c5465387b1b0f724994a"
+MY_P="${PN}-${GIT_COMMIT::7}"
+SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine pam passfile smime spell ssl threads"
+
+DEPEND=">=sys-libs/ncurses-5.1:0=
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap )
+ pam? ( sys-libs/pam )
+ spell? ( app-text/aspell )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+RDEPEND="${DEPEND}
+ app-misc/mime-types
+"
+
+HTML_DOCS=("doc/tech-notes/")
+
+PATCHES=(
+ "${FILESDIR}/${P}-nopam.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ myconf=(
+ --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)
+ $(use_with pam)
+ )
+
+ if use ssl; then
+ myconf+=(
+ --with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+ --with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+ --with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+ )
+ fi
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake -j1 AR=$(tc-getAR)
+}
+
+src_install() {
+ if use onlyalpine ; then
+ dobin alpine/alpine
+ doman doc/man1/alpine.1
+ else
+ emake -j1 DESTDIR="${D}" install
+ doman doc/man1/*.1
+ fi
+
+ dodoc NOTICE README*
+
+ if use doc ; then
+ dodoc doc/brochure.txt
+
+ dodoc doc/tech-notes/tech-notes.txt
+ 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/alpine-2.21.1-nopam.patch b/mail-client/alpine/files/alpine-2.21.1-nopam.patch
new file mode 100644
index 00000000000..1552f440b53
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.21.1-nopam.patch
@@ -0,0 +1,27 @@
+--- ./configure.ac 2019-11-04 20:09:50.094172283 +0100
++++ ./configure.ac 2019-11-04 20:59:33.775007247 +0100
+@@ -257,6 +257,7 @@
+ alpine_c_client_gccoptlevel="-O0"
+ AC_MSG_RESULT([no])
+ fi
++AC_ARG_WITH([pam], AS_HELP_STRING([--without-pam], [Build without PAM support]))
+
+ dnl disable mouse support
+ AC_MSG_CHECKING([option: mouse support enabled])
+@@ -1108,7 +1109,7 @@
+ alpine_PAM="yes"
+ else
+ systype="LNX"
+- AC_CHECK_LIB(pam, pam_start,
++ AS_IF(test "x$with_pam" != "xno",
+ [
+ alpine_c_client_target="lnp"
+ alpine_PAM="yes"
+@@ -1119,6 +1120,7 @@
+ else
+ alpine_c_client_target="lnx"
+ fi
++ alpine_PAM="none"
+ ])
+ fi
+ ;;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/
@ 2020-01-23 14:29 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-01-23 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 57c9cbfa8d8e2204abd1dc4c84c26bb191c8f7ef
Author: Robert Siebeck <gentoo.2019 <AT> r123 <DOT> de>
AuthorDate: Mon Jan 20 11:15:51 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 14:28:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c9cbfa
mail-client/alpine: remove old versions
Signed-off-by: Robert Siebeck <gentoo.2019 <AT> r123.de>
Closes: https://github.com/gentoo/gentoo/pull/14396
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alpine/Manifest | 3 -
mail-client/alpine/alpine-2.00-r7.ebuild | 108 ----------
mail-client/alpine/alpine-2.21.1.ebuild | 87 --------
mail-client/alpine/files/2.00-c-client.patch | 251 ----------------------
mail-client/alpine/files/2.00-lcrypto.patch | 12 --
mail-client/alpine/files/2.00-lpam.patch | 13 --
mail-client/alpine/files/2.00-qa-chappa-115.patch | 40 ----
mail-client/alpine/files/2.00-qa.patch | 19 --
mail-client/alpine/metadata.xml | 2 -
9 files changed, 535 deletions(-)
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 967c89adbb1..e972ef49612 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,5 +1,2 @@
-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
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 138fdc96cdd..00000000000
--- 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.21.1.ebuild
deleted file mode 100644
index e8f94db8e4d..00000000000
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs vcs-snapshot
-
-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"
-
-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"
-
-DEPEND="sys-libs/pam
- >=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
- eautoreconf
-}
-
-src_configure() {
- myconf=(
- --without-tcl
- --with-system-pinerc="${EPREFIX}"/etc/pine.conf
- --with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
- )
-
- if use ssl; then
- myconf+=(
- --with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
- --with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
- --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[@]}"
-}
-
-src_compile() {
- emake AR=$(tc-getAR)
-}
-
-src_install() {
- if use onlyalpine ; then
- dobin alpine/alpine
- doman doc/man1/alpine.1
- else
- emake DESTDIR="${D}" install
- doman doc/man1/*.1
- fi
-
- dodoc NOTICE README*
-
- if use doc ; then
- dodoc doc/brochure.txt
-
- docinto html/tech-notes
- dodoc -r doc/tech-notes/*.html
- dodoc -r doc/tech-notes/*.txt
- 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 b3b33bcc455..00000000000
--- 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 b0601503fec..00000000000
--- 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 69e66d7efa0..00000000000
--- 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 e13b8086473..00000000000
--- 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 da2535ef15c..00000000000
--- 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 777a30ec204..155fe030ffa 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/
@ 2020-04-22 13:38 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-04-22 13:38 UTC (permalink / raw
To: gentoo-commits
commit: f2a8302db892759b973a994cdf8544bf431b7370
Author: Robert Siebeck <gentoo.2019 <AT> r123 <DOT> de>
AuthorDate: Sun Apr 19 22:02:26 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 13:38:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a8302d
mail-client/alpine: don't call cc directly
Closes: https://bugs.gentoo.org/718368
Signed-off-by: Robert Siebeck <gentoo.2019 <AT> r123.de>
Closes: https://github.com/gentoo/gentoo/pull/15424
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alpine/alpine-2.22.ebuild | 6 ++++++
mail-client/alpine/files/alpine-2.22-cc.patch | 24 ++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/mail-client/alpine/alpine-2.22.ebuild b/mail-client/alpine/alpine-2.22.ebuild
index 75f6d667338..c2b83e1187b 100644
--- a/mail-client/alpine/alpine-2.22.ebuild
+++ b/mail-client/alpine/alpine-2.22.ebuild
@@ -27,9 +27,15 @@ RDEPEND="${DEPEND}
app-misc/mime-types
"
+PATCHES=(
+ "${FILESDIR}/${P}-cc.patch"
+)
+
src_prepare() {
default
eautoreconf
+ tc-export CC RANLIB AR
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
}
src_configure() {
diff --git a/mail-client/alpine/files/alpine-2.22-cc.patch b/mail-client/alpine/files/alpine-2.22-cc.patch
new file mode 100644
index 00000000000..87132bdd6b5
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.22-cc.patch
@@ -0,0 +1,24 @@
+--- ./imap/tools/Makefile 2020-04-19 23:45:13.080083548 +0200
++++ ./imap/tools/Makefile 2020-04-19 23:45:24.525083844 +0200
+@@ -21,7 +21,6 @@
+ # Internet: MRC@CAC.Washington.EDU
+
+
+-CC=cc
+ RM=rm -f
+
+
+--- ./imap/src/osdep/unix/Makefile 2020-04-19 23:54:55.454098598 +0200
++++ ./imap/src/osdep/unix/Makefile 2020-04-19 23:54:55.454098598 +0200
+@@ -132,10 +132,8 @@
+
+ # Commands possibly overridden by the individual port
+
+-ARRC=ar rc
+-CC=cc
++ARRC=$(AR) rc
+ LN=ln -s
+-RANLIB=ranlib
+
+
+ # Standard distribution build parameters
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/
@ 2023-08-19 6:08 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2023-08-19 6:08 UTC (permalink / raw
To: gentoo-commits
commit: 48ed3cf79fcd349f5014d31ff4d4f18abb897f72
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 18:24:26 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 06:08:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ed3cf7
mail-client/alpine: Fix incompatible function pointer types
Closes: https://bugs.gentoo.org/883271
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32265
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alpine/alpine-2.26-r2.ebuild | 91 ++++++++++
.../files/alpine-2.26-fix-clang16-build.patch | 185 +++++++++++++++++++++
2 files changed, 276 insertions(+)
diff --git a/mail-client/alpine/alpine-2.26-r2.ebuild b/mail-client/alpine/alpine-2.26-r2.ebuild
new file mode 100644
index 000000000000..b9dfafbf285c
--- /dev/null
+++ b/mail-client/alpine/alpine-2.26-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://alpineapp.email/ https://repo.or.cz/alpine.git/"
+CHAPPA_PATCH_NAME="${P}-chappa-5.patch"
+SRC_URI="https://alpineapp.email/alpine/release/src/${P}.tar.xz
+ chappa? ( https://alpineapp.email/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl"
+
+DEPEND="sys-libs/ncurses:=
+ virtual/libcrypt:=
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap:= )
+ ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+ app-misc/mime-types
+"
+
+src_prepare() {
+ default
+ use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
+ eapply "${FILESDIR}/${PN}-2.26-fix-clang16-build.patch"
+ eautoreconf
+ tc-export CC RANLIB AR
+ export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+ myconf=(
+ --without-tcl
+ --with-pthread
+ --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_enable nls)
+ $(use_with ipv6)
+ $(use_with smime)
+ )
+
+ if has_version "app-text/hunspell"; then
+ myconf+=( --with-interactive-spellcheck=/usr/bin/hunspell )
+ elif has_version "app-text/aspell"; then
+ myconf+=( --with-interactive-spellcheck=/usr/bin/aspell )
+ fi
+
+ if use ssl; then
+ myconf+=(
+ --with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+ --with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+ --with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+ )
+ fi
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake -j1 AR="$(tc-getAR)"
+}
+
+src_install() {
+ if use onlyalpine ; then
+ dobin alpine/alpine
+ doman doc/man1/alpine.1
+ else
+ emake -j1 DESTDIR="${D}" install
+ doman doc/man1/*.1
+ fi
+ dodoc NOTICE README*
+ dodoc doc/brochure.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
+}
+
+pkg_postinst() {
+ optfeature "Spell checking" app-text/hunspell app-text/aspell
+}
diff --git a/mail-client/alpine/files/alpine-2.26-fix-clang16-build.patch b/mail-client/alpine/files/alpine-2.26-fix-clang16-build.patch
new file mode 100644
index 000000000000..7d3a83e462db
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.26-fix-clang16-build.patch
@@ -0,0 +1,185 @@
+Bug: https://bugs.gentoo.org/883271
+--- a/alpine/adrbkcmd.c
++++ b/alpine/adrbkcmd.c
+@@ -81,7 +81,7 @@ int ab_export(struct pine *, long, int, int);
+ VCARD_INFO_S *prepare_abe_for_vcard(struct pine *, AdrBk_Entry *, int);
+ void write_single_tab_entry(gf_io_t, VCARD_INFO_S *);
+ int percent_done_copying(void);
+-int cmp_action_list(const qsort_t *, const qsort_t *);
++int cmp_action_list(const void *, const void *);
+ void set_act_list_member(ACTION_LIST_S *, a_c_arg_t, PerAddrBook *, PerAddrBook *, char *);
+ void convert_pinerc_to_remote(struct pine *, char *);
+
+@@ -5187,7 +5187,7 @@ percent_done_copying(void)
+ }
+
+ int
+-cmp_action_list(const qsort_t *a1, const qsort_t *a2)
++cmp_action_list(const void *a1, const void *a2)
+ {
+ ACTION_LIST_S *x = (ACTION_LIST_S *)a1;
+ ACTION_LIST_S *y = (ACTION_LIST_S *)a2;
+--- a/pico/browse.c
++++ b/pico/browse.c
+@@ -1920,7 +1920,7 @@ getfcells(char *dname, int fb_flags)
+ /*
+ * sort files case independently
+ */
+- qsort((qsort_t *)filtnames, (size_t)nentries, sizeof(char *), sstrcasecmp);
++ qsort((qsort_t *)filtnames, (size_t)nentries, sizeof(char *), (void *)sstrcasecmp);
+
+ /*
+ * this is so we use absolute path names for stats.
+--- a/pith/adrbklib.c
++++ b/pith/adrbklib.c
+@@ -84,7 +84,7 @@ int cmp_ae_by_nick_lists_last(const qsort_t *,const qsort_t *);
+ int cmp_cntr_by_nick_lists_last(const qsort_t *, const qsort_t *);
+ int cmp_ae_by_nick(const qsort_t *, const qsort_t *);
+ int cmp_cntr_by_nick(const qsort_t *, const qsort_t *);
+-int cmp_addr(const qsort_t *, const qsort_t *);
++int cmp_addr(const void *, const void *);
+ void sort_addr_list(char **);
+ int build_abook_datastruct(AdrBk *, char *, size_t);
+ AdrBk_Entry *init_ae(AdrBk *, AdrBk_Entry *, char *);
+@@ -4671,7 +4671,7 @@ cmp_cntr_by_nick(const qsort_t *a, const qsort_t *b)
+ * For sorting a simple list of pointers to addresses (skip initial quotes)
+ */
+ int
+-cmp_addr(const qsort_t *a1, const qsort_t *a2)
++cmp_addr(const void *a1, const void *a2)
+ {
+ char *x = *(char **)a1, *y = *(char **)a2;
+ char *r, *s;
+@@ -4762,14 +4762,14 @@ adrbk_sort(AdrBk *ab, a_c_arg_t current_entry_num, adrbk_cntr_t *new_entry_num,
+ qsort((qsort_t *)sort_array,
+ (size_t)count,
+ sizeof(adrbk_cntr_t),
+- (ab->sort_rule == AB_SORT_RULE_FULL_LISTS) ?
+- cmp_cntr_by_full_lists_last :
+- (ab->sort_rule == AB_SORT_RULE_FULL) ?
+- cmp_cntr_by_full :
+- (ab->sort_rule == AB_SORT_RULE_NICK_LISTS) ?
+- cmp_cntr_by_nick_lists_last :
+- /* (ab->sort_rule == AB_SORT_RULE_NICK) */
+- cmp_cntr_by_nick);
++ (void *)((ab->sort_rule == AB_SORT_RULE_FULL_LISTS) ?
++ cmp_cntr_by_full_lists_last :
++ (ab->sort_rule == AB_SORT_RULE_FULL) ?
++ cmp_cntr_by_full :
++ (ab->sort_rule == AB_SORT_RULE_NICK_LISTS) ?
++ cmp_cntr_by_nick_lists_last :
++ /* (ab->sort_rule == AB_SORT_RULE_NICK) */
++ cmp_cntr_by_nick));
+ }
+
+ dprint((9, "- adrbk_sort: done with first sort -\n"));
+--- a/pith/folder.c
++++ b/pith/folder.c
+@@ -1939,11 +1939,11 @@ resort_folder_list(FLIST *flist)
+ {
+ if(flist && folder_total(flist) > 1 && flist->folders)
+ qsort(flist->folders, folder_total(flist), sizeof(flist->folders[0]),
+- (ps_global->fld_sort_rule == FLD_SORT_ALPHA_DIR_FIRST)
+- ? compare_folders_dir_alpha_qsort
+- : (ps_global->fld_sort_rule == FLD_SORT_ALPHA_DIR_LAST)
+- ? compare_folders_alpha_dir_qsort
+- : compare_folders_alpha_qsort);
++ (void *)((ps_global->fld_sort_rule == FLD_SORT_ALPHA_DIR_FIRST)
++ ? compare_folders_dir_alpha_qsort
++ : (ps_global->fld_sort_rule == FLD_SORT_ALPHA_DIR_LAST)
++ ? compare_folders_alpha_dir_qsort
++ : compare_folders_alpha_qsort));
+ }
+
+
+--- a/pith/init.c
++++ b/pith/init.c
+@@ -28,7 +28,7 @@
+ /*
+ * Internal prototypes
+ */
+-int compare_sm_files(const qsort_t *, const qsort_t *);
++int compare_sm_files(const void *, const void *);
+
+
+
+@@ -327,7 +327,7 @@ init_save_defaults(void)
+ in above format.
+ ----*/
+ int
+-compare_sm_files(const qsort_t *aa, const qsort_t *bb)
++compare_sm_files(const void *aa, const void *bb)
+ {
+ struct sm_folder *a = (struct sm_folder *)aa,
+ *b = (struct sm_folder *)bb;
+--- a/pith/sort.c
++++ b/pith/sort.c
+@@ -41,7 +41,7 @@ void sort_sort_callback(MAILSTREAM *, unsigned long *, unsigned long);
+ int percent_sorted(void);
+ int pine_compare_long(const qsort_t *, const qsort_t *);
+ int pine_compare_long_rev(const qsort_t *, const qsort_t *);
+-int pine_compare_scores(const qsort_t *, const qsort_t *);
++int pine_compare_scores(const void *, const void *);
+ void build_score_array(MAILSTREAM *, MSGNO_S *);
+ void free_score_array(void);
+
+@@ -162,7 +162,7 @@ sort_folder(MAILSTREAM *stream, MSGNO_S *msgmap, SortOrder new_sort,
+ */
+ qsort(msgmap->sort+1, (size_t) mn_get_total(msgmap),
+ sizeof(long),
+- new_rev ? pine_compare_long_rev : pine_compare_long);
++ (void *)(new_rev ? pine_compare_long_rev : pine_compare_long));
+ }
+ else if(mn_get_total(msgmap) > 0L){
+ if(new_rev){
+@@ -672,7 +672,7 @@ free_score_array(void)
+ Compare scores
+ ----*/
+ int
+-pine_compare_scores(const qsort_t *a, const qsort_t *b)
++pine_compare_scores(const void *a, const void *b)
+ {
+ long *mess_a = (long *)a, *mess_b = (long *)b, mdiff;
+ long sdiff;
+--- a/pith/takeaddr.c
++++ b/pith/takeaddr.c
+@@ -1377,7 +1377,7 @@ process_vcard_atts(MAILSTREAM *stream, long int msgno,
+
+
+ int
+-cmp_swoop_list(const qsort_t *a1, const qsort_t *a2)
++cmp_swoop_list(const void *a1, const void *a2)
+ {
+ SWOOP_S *x = (SWOOP_S *)a1;
+ SWOOP_S *y = (SWOOP_S *)a2;
+--- a/pith/takeaddr.h
++++ b/pith/takeaddr.h
+@@ -98,7 +98,7 @@ int convert_ta_to_lines(TA_S *, LINES_TO_TAKE **);
+ LINES_TO_TAKE *new_ltline(LINES_TO_TAKE **);
+ int add_addresses_to_talist(struct pine *, long, char *, TA_S **, ADDRESS *, int);
+ int process_vcard_atts(MAILSTREAM *, long, BODY *, BODY *, char *, TA_S **);
+-int cmp_swoop_list(const qsort_t *, const qsort_t *);
++int cmp_swoop_list(const void *, const void *);
+ int vcard_to_ta(char *, char *, char *, char *, char *, char *, TA_S **);
+ char *getaltcharset(char *, char **, char **, int *);
+ void switch_to_last_comma_first(char *, char *, size_t);
+--- a/pith/thread.c
++++ b/pith/thread.c
+@@ -45,7 +45,7 @@ THREADNODE *sort_threads_and_collapse(THREADNODE *);
+ THREADNODE *insert_tree_in_place(THREADNODE *, THREADNODE *);
+ unsigned long branch_greatest_num(THREADNODE *, int);
+ long calculate_visible_threads(MAILSTREAM *);
+-int pine_compare_size_thread(const qsort_t *, const qsort_t *);
++int pine_compare_size_thread(const void *, const void *);
+
+
+ PINETHRD_S *
+@@ -1892,7 +1892,7 @@ get_length_branch(MAILSTREAM *stream, long rawno)
+ return branchp ? (count ? count : 1L) : 0L;
+ }
+
+-int pine_compare_size_thread(const qsort_t *a, const qsort_t *b)
++int pine_compare_size_thread(const void *a, const void *b)
+ {
+ SIZETHREAD_T *s = (SIZETHREAD_T *) a, *t = (SIZETHREAD_T *) b;
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-19 6:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-22 13:38 [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-08-19 6:08 Joonas Niilola
2020-01-23 14:29 Joonas Niilola
2019-11-07 5:42 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox