diff options
Diffstat (limited to 'mail-client/nmh')
-rw-r--r-- | mail-client/nmh/Manifest | 10 | ||||
-rw-r--r-- | mail-client/nmh/files/nmh-1.3-db5.patch | 17 | ||||
-rw-r--r-- | mail-client/nmh/files/nmh-1.3-inc-login.patch | 27 | ||||
-rw-r--r-- | mail-client/nmh/files/nmh-1.3-install.patch | 12 | ||||
-rw-r--r-- | mail-client/nmh/files/nmh-1.3-m_getfld.patch | 29 | ||||
-rw-r--r-- | mail-client/nmh/files/nmh-1.3-parallelmake.patch | 99 | ||||
-rw-r--r-- | mail-client/nmh/metadata.xml | 5 | ||||
-rw-r--r-- | mail-client/nmh/nmh-1.3-r4.ebuild | 70 |
8 files changed, 269 insertions, 0 deletions
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest new file mode 100644 index 000000000000..1a2284e3845b --- /dev/null +++ b/mail-client/nmh/Manifest @@ -0,0 +1,10 @@ +AUX nmh-1.3-db5.patch 568 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78 SHA512 512838c9838124f29e5f3bf0f9ea6956d1fb0a231fd4301f78268b36f9d69dcfec2cdf5d798569b191752a654934acd68b8a8fa095385daa2daf127718fdf376 WHIRLPOOL 84b5b3edd09298342ac601584a6459054eb4921c5891671ad189d5e8f3704cdff4133b76eabd8666e2e2d5341771b2e853c0776a09b2f0c90f65a317c343a801 +AUX nmh-1.3-inc-login.patch 602 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2 SHA512 8554224b102b9a849f8f49d26895153ed96a236a1c93ddeb6241552c4e074a70540cc421a2d4f341fc717eeb973999e3de9888dd62da9c247d3635c14c45ae0e WHIRLPOOL 02364670461307556a0728069c30e087531a9178f52cd0e407bc67d2fd5ad84e0e04c0a4a3b8ac8a21cbdae005ab98c156c29a16befb88a1252318dc9ee1e341 +AUX nmh-1.3-install.patch 482 SHA256 b5f5ba018b71ee02ebc0618df1d1eb47a74214e7ff210975040a4f51619b0cfa SHA512 40f9530cdff47b89e9c186942a2bbb2c302c5a45e98f3f082686ffff21b9f1d0deed7b2406240656289eb9e04d799d21687b0690943481d37ccc6d0024aee179 WHIRLPOOL e4fef2339350665ae55acc660cbef0b51e1dd2f2fb37bfafd97253d9e4c094d12dc50d2b96085276097f09084812b98d0052685dd605bdc978cc7453096d6c39 +AUX nmh-1.3-m_getfld.patch 624 SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5 SHA512 85b088a4c7470d498e9c6ab5c39fb1d7752acf91db3dec77ebe176bae78dce2758752027af7f9024c81b422627559ca18df6dc4ce55a2c31b3df09d3fddf9a47 WHIRLPOOL 79ea44333ba14f4abbf10f9d9cfee5beb05c6d8477964666066b8d7105a52af3e71bbd0e22e2fa2bb7a1eb8914276ece1507e11d570e201f9457319f1e3468de +AUX nmh-1.3-parallelmake.patch 3121 SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c SHA512 cd84d2dceca9b66ecd50afe5bc08aa48b825b054ac2367bb762d4fe34ab42d1a0d2715f7f9459656874f209dc397d5e12969217154cb2b6c9a55b68354fd9132 WHIRLPOOL cdd1964772244e870a6b40323d8834307af6e0b196516d2a30556e68f2630381ce3bbe9e8f21821e142ca257f69913634f5aba83143c0ede3b4ff496c732fc9d +DIST nmh-1.3.tar.gz 847614 SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47 SHA512 f7ab227813a7fb1c45cb1c91ca5c020c22be28193152d80d008cf962856138a2fdfe7dc5a9fae5e3702c1a7020b9609826ebffd843241d9b09b7b136d901e77a WHIRLPOOL d38bc6353a288e28b07cdd1df5bd9785f06a0b96607ef3a1cf72c7bded99d9d81da9f9015629927cc033d90a83caec438656df05d2056735e8480915617b8905 +EBUILD nmh-1.3-r4.ebuild 1921 SHA256 57878ce0d11278e7c1ca061d02bad85d728ab2f0eda908d96c65906cace78b53 SHA512 68f69901b22dffb37b53b38666f62d1bb2093f642430652387bec9a24717f37ce10a81ea65578f9e1239fd541a3d5f7ffd3a892988340dc17295c41709614056 WHIRLPOOL 855420481a24f3f5a28b8e63864374ba6b87c0d2a7aab8f92abd9f296c5bfedd20faa2c257fbe67da09ecd322c52913a8aeeb0853e7b06fd2bf6e84e0711d143 +MISC ChangeLog 3074 SHA256 4b641caa747366107d2d62f195a04334d634abb591aa0419f5c8d1db2e38812d SHA512 261be639d0e6e5e0fb6919355f9c7e3486edeb73d2c23fba0e69ef57a5f6195d3781c540fb8a86da9bd06a4384d47b30b3f6d683b0f5c70b0dbfeaf51aba5028 WHIRLPOOL aa1169e089b89ceaf33ae5055c13ceea09341aae5ee90b12ef39108a4bdccdb84b91450e295661f26c98a3923fb269206ff71fbd6e9c08893e95fd92a0a91a6b +MISC ChangeLog-2015 1473 SHA256 ef22e09da70249ba52ed5c6fd8cbf169654954c519578cc7dc6b89061e80831c SHA512 ce151c46aa512f9ac1afcd7952575ecfe21f32f3cb03f6fc7d54801e7c2e4c1dee563c05d46b9cf4109673c073db53ac74265ff750c9d7d5e5b301b778fc2368 WHIRLPOOL f4899cdd87e7dae7df935eef3b39eba716fc262f193a6d53afa790b2070bdcd5c8cf295f722ac3caab6587c7133262f4a4f037628caace1d9d7a9e65a435311e +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 diff --git a/mail-client/nmh/files/nmh-1.3-db5.patch b/mail-client/nmh/files/nmh-1.3-db5.patch new file mode 100644 index 000000000000..473e2b609aeb --- /dev/null +++ b/mail-client/nmh/files/nmh-1.3-db5.patch @@ -0,0 +1,17 @@ +diff --git a/uip/slocal.c b/uip/slocal.c +index 9697d84..d38a020 100644 +--- a/uip/slocal.c ++++ b/uip/slocal.c +@@ -46,6 +46,12 @@ + extern int initgroups(char*, int); + #endif + ++/* This define is needed for Berkeley db v5 and above to ++ * make the header file expose the 'historical' ndbm APIs. ++ * We define it unconditionally because this is simple and ++ * harmless. ++ */ ++#define HAVE_DBM + /* This define is needed for Berkeley db v2 and above to + * make the header file expose the 'historical' ndbm APIs. + * We define it unconditionally because this is simple and diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch new file mode 100644 index 000000000000..631a03f3e35a --- /dev/null +++ b/mail-client/nmh/files/nmh-1.3-inc-login.patch @@ -0,0 +1,27 @@ +diff --git a/uip/inc.c b/uip/inc.c +index cf12ab8..b8384cd 100644 +--- a/uip/inc.c ++++ b/uip/inc.c +@@ -496,8 +496,7 @@ main (int argc, char **argv) + * a POP server? + */ + if (inc_type == INC_POP) { +- if (user == NULL) +- user = getusername (); ++ + if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { + kpop = 1; + } +@@ -506,6 +505,12 @@ main (int argc, char **argv) + else + ruserpass (host, &user, &pass); + ++ /* ++ * Do this _after_ ruserpass, otherwise the login field will be unusable ++ */ ++ if (user == NULL) ++ user = getusername (); ++ + /* + * initialize POP connection + */ diff --git a/mail-client/nmh/files/nmh-1.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch new file mode 100644 index 000000000000..25dc321fd180 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.3-install.patch @@ -0,0 +1,12 @@ +diff --git a/uip/Makefile.in b/uip/Makefile.in +index b3c6717..5ed34f8 100644 +--- a/uip/Makefile.in ++++ b/uip/Makefile.in +@@ -267,7 +267,6 @@ install-lcmds: + rm -f $(DESTDIR)$(bindir)/folders + rm -f $(DESTDIR)$(bindir)/prev + rm -f $(DESTDIR)$(bindir)/next +- rm -f $(DESTDIR)$(libdir)/install-mh + $(LN) $(DESTDIR)$(bindir)/flist $(DESTDIR)$(bindir)/flists + $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders + $(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/prev diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch new file mode 100644 index 000000000000..6e0104c3d4c9 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.3-m_getfld.patch @@ -0,0 +1,29 @@ +diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c +index caf9519..13c2c3d 100644 +--- a/sbr/m_getfld.c ++++ b/sbr/m_getfld.c +@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, char *str) + 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 ((unsigned char *)--str); ++ return ((unsigned char *)str); + } ++ return 0; + } + + diff --git a/mail-client/nmh/files/nmh-1.3-parallelmake.patch b/mail-client/nmh/files/nmh-1.3-parallelmake.patch new file mode 100644 index 000000000000..1ac2415e9845 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.3-parallelmake.patch @@ -0,0 +1,99 @@ +diff --git a/etc/Makefile.in b/etc/Makefile.in +index f1412b1..9af408d 100644 +--- a/etc/Makefile.in ++++ b/etc/Makefile.in +@@ -86,13 +86,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefile + install: install-bin-files install-etc-files + + install-bin-files: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ mkdir -p $(DESTDIR)$(bindir) + for script in $(GENERATED_BIN_FILES); do \ + $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \ + done + + install-etc-files: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir) ++ mkdir -p $(DESTDIR)$(etcdir) + INSTALL_FILES="$(GENERATED_ETC_FILES)"; \ + for file in $(STATIC_FILES); do \ + INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \ +diff --git a/man/Makefile.in b/man/Makefile.in +index 2ac26f3..7c613bf 100644 +--- a/man/Makefile.in ++++ b/man/Makefile.in +@@ -130,14 +130,14 @@ install: install-man1 install-man5 install-man8 + + # install the man pages in man1 + install-man1: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1) ++ mkdir -p $(DESTDIR)$(mandir)/man$(manext1) + for file in $(MAN1); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \ + done + + # install the man pages in man5 + install-man5: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5) ++ mkdir -p $(DESTDIR)$(mandir)/man$(manext5) + for file in $(MAN5); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \ + done +@@ -148,7 +148,7 @@ install-man5: + + # install the man pages in man8 + install-man8: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8) ++ mkdir -p $(DESTDIR)$(mandir)/man$(manext8) + for file in $(MAN8); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \ + done +diff --git a/mts/Makefile.in b/mts/Makefile.in +index f739e30..f606fef 100644 +--- a/mts/Makefile.in ++++ b/mts/Makefile.in +@@ -43,7 +43,7 @@ SUBDIRS = smtp + + all: all-recursive libmts.a + +-all-recursive: ++all-recursive $(OBJS): + for subdir in $(SUBDIRS); do \ + (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \ + done +diff --git a/uip/Makefile.in b/uip/Makefile.in +index 5ed34f8..c9239b1 100644 +--- a/uip/Makefile.in ++++ b/uip/Makefile.in +@@ -256,13 +256,13 @@ install: install-cmds install-misc install-lcmds install-scmds + + # install commands + install-cmds: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ mkdir -p $(DESTDIR)$(bindir) + for cmd in $(CMDS); do \ + $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \ + done + + # install links +-install-lcmds: ++install-lcmds: install-cmds + rm -f $(DESTDIR)$(bindir)/flists + rm -f $(DESTDIR)$(bindir)/folders + rm -f $(DESTDIR)$(bindir)/prev +@@ -274,13 +274,13 @@ install-lcmds: + + # install misc support binaries + install-misc: +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ++ mkdir -p $(DESTDIR)$(libdir) + for misc in $(MISC); do \ + $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \ + done + + # install commands with special installation needs (thus no $(SCMDS) use here) +-install-scmds: ++install-scmds: install-cmds + if test x$(SETGID_MAIL) != x; then \ + $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \ + else \ diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/mail-client/nmh/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<!-- maintainer-needed --> +</pkgmetadata> diff --git a/mail-client/nmh/nmh-1.3-r4.ebuild b/mail-client/nmh/nmh-1.3-r4.ebuild new file mode 100644 index 000000000000..c4260f041840 --- /dev/null +++ b/mail-client/nmh/nmh-1.3-r4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +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" +IUSE="gdbm" + +DEPEND="gdbm? ( sys-libs/gdbm ) + !gdbm? ( sys-libs/db:= ) + >=sys-libs/ncurses-5.2:0= + net-libs/liblockfile + >=app-misc/editor-wrapper-3 + !!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show +RDEPEND="${DEPEND}" + +DOCS=( ChangeLog DATE MACHINES README ) + +# Patches from bug #22173. +# bug #57886 +# bug #319937 +# Allow parallel compiles/installs + +PATCHES=( "${FILESDIR}"/${P}-inc-login.patch + "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-m_getfld.patch + "${FILESDIR}"/${P}-db5.patch + "${FILESDIR}"/${P}-parallelmake.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="--libdir=/usr/$(get_libdir)/nmh" + + # Have gdbm use flag actually control which version of db in use + if use gdbm; then + myconf="${myconf} --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat" + else + if has_version ">=sys-libs/db-2"; then + myconf="${myconf} --with-ndbmheader=db.h --with-ndbm=db" + else + myconf="${myconf} --with-ndbmheader=db1/ndbm.h --with-ndbm=db1" + fi + fi + + # use wrapper scripts to avoid implicit dependencies (Bug #294762) + EDITOR=/usr/libexec/editor + PAGER=/usr/libexec/pager + + econf \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-editor="${EDITOR}" \ + --with-pager="${PAGER}" \ + --enable-nmh-pop \ + --sysconfdir=/etc/nmh \ + ${myconf} +} |