summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2017-10-18 04:40:43 -0400
committerTim Harder <radhermit@gentoo.org>2017-10-18 04:42:45 -0400
commitea905e49c90535186113a740193bcbc6eb8ce415 (patch)
tree7638b493b78af52526e28bf5813ac1076e75976f /mail-client
parentnet-mail/dovecot: bump to 2.2.33.1 (diff)
downloadgentoo-ea905e49c90535186113a740193bcbc6eb8ce415.tar.gz
gentoo-ea905e49c90535186113a740193bcbc6eb8ce415.tar.bz2
gentoo-ea905e49c90535186113a740193bcbc6eb8ce415.zip
mail-client/nmh: version bump to 1.6
Closes: https://bugs.gentoo.org/423681 Closes: https://bugs.gentoo.org/555550 Closes: https://bugs.gentoo.org/631662
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/nmh/Manifest1
-rw-r--r--mail-client/nmh/files/nmh-1.6-m_getfld.patch25
-rw-r--r--mail-client/nmh/metadata.xml5
-rw-r--r--mail-client/nmh/nmh-1.6.ebuild72
4 files changed, 102 insertions, 1 deletions
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index 81deed7ed03..010f048862e 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -1 +1,2 @@
DIST nmh-1.3.tar.gz 847614 SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47 SHA512 f7ab227813a7fb1c45cb1c91ca5c020c22be28193152d80d008cf962856138a2fdfe7dc5a9fae5e3702c1a7020b9609826ebffd843241d9b09b7b136d901e77a WHIRLPOOL d38bc6353a288e28b07cdd1df5bd9785f06a0b96607ef3a1cf72c7bded99d9d81da9f9015629927cc033d90a83caec438656df05d2056735e8480915617b8905
+DIST nmh-1.6.tar.gz 1197272 SHA256 29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3 SHA512 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7 WHIRLPOOL 64eaf63a3453bdd6862ce3eab9a4b7df1ca1dccefdc872f1866c1f6d89d174249051f6768797c3f067df878e018be0ff4ad6adf6b4b5e4844a53624f67ff2547
diff --git a/mail-client/nmh/files/nmh-1.6-m_getfld.patch b/mail-client/nmh/files/nmh-1.6-m_getfld.patch
new file mode 100644
index 00000000000..36f20779664
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.6-m_getfld.patch
@@ -0,0 +1,25 @@
+--- nmh-1.6/sbr/m_getfld.c
++++ nmh-1.6/sbr/m_getfld.c
+@@ -919,16 +919,16 @@
+ register char *ep = pat + patln;
+ register char pc = *pat++;
+
+- for(;;) {
+- while (pc != *str++)
+- if (str > es)
+- return 0;
++ for(; str <= es; str++) {
++ if (pc != *str)
++ continue;
+ if (str > es+1)
+ return 0;
+- sp = str; pp = pat;
++ sp = str+1; pp = pat;
+ while (pp < ep && *sp++ == *pp)
+ pp++;
+ if (pp >= ep)
+- return --str;
++ return ((unsigned char *)str);
+ }
++ return 0;
+ }
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
index 6f49eba8f49..1c3bc7b3fce 100644
--- a/mail-client/nmh/metadata.xml
+++ b/mail-client/nmh/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/mail-client/nmh/nmh-1.6.ebuild b/mail-client/nmh/nmh-1.6.ebuild
new file mode 100644
index 00000000000..c64883e3515
--- /dev/null
+++ b/mail-client/nmh/nmh-1.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="https://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="gdbm readline sasl ssl"
+
+# bug 295996: media-gfx/pixie also uses show
+# bug 631662: sys-apps/pick also uses pick
+# bug 555550: sci-mathematics/snns also uses scan
+DEPEND="gdbm? ( sys-libs/gdbm )
+ !gdbm? ( sys-libs/db:= )
+ >=sys-libs/ncurses-5.2:0=
+ net-libs/liblockfile
+ readline? ( sys-libs/readline:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )
+ !!media-gfx/pixie
+ !!sys-apps/pick
+ !!sci-mathematics/snns
+"
+RDEPEND="${DEPEND}
+ virtual/editor
+ virtual/pager
+"
+
+DOCS=( ChangeLog DATE MACHINES README )
+
+PATCHES=(
+ # bug #57886
+ "${FILESDIR}"/${P}-m_getfld.patch
+ # bug #319937
+ "${FILESDIR}"/${PN}-1.3-db5.patch
+)
+
+src_configure() {
+ # Bug 348816 & Bug 341741: The previous ebuild default of
+ # /usr/bin caused unnecessary conflicts with other
+ # packages. However, the default nmh libdir location causes
+ # problems with cross-compiling, so we use, eg., /usr/lib64.
+ # Users may use /usr/lib/nmh in scripts needing these support
+ # programs in normal environments.
+ local myconf=(
+ --prefix="${EPREFIX}"/usr
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/nmh
+ --mandir="${EPREFIX}"/usr/share/man
+ --sysconfdir="${EPREFIX}"/etc/nmh
+ $(use_with sasl cyrus-sasl)
+ $(use_with ssl tls)
+ $(use_with readline)
+ )
+
+ # have gdbm use flag actually control which version of db in use
+ if use gdbm; then
+ myconf+=( --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat )
+ else
+ if has_version ">=sys-libs/db-2"; then
+ myconf+=( --with-ndbmheader=db.h --with-ndbm=db )
+ else
+ myconf+=( --with-ndbmheader=db1/ndbm.h --with-ndbm=db1 )
+ fi
+ fi
+
+ econf "${myconf[@]}"
+}