net-mail/notmuch: Remove vulnerable versions

Bug: https://bugs.gentoo.org/701350
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe@gentoo.org>
This commit is contained in:
Amadeusz Piotr Żołnowski
2020-02-01 23:32:54 +00:00
parent 3332a84912
commit e705c4ca04
6 changed files with 0 additions and 616 deletions

View File

@@ -1,4 +1,2 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65

View File

@@ -1,61 +0,0 @@
From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
<aidecoe@aidecoe.name>
Date: Sun, 7 Jul 2019 11:33:09 +0100
Subject: [PATCH] Use loopback IP address rather than name
---
test/smtp-dummy.c | 8 ++++----
test/test-lib.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index a7c1fe4f..822a986a 100644
--- a/test/smtp-dummy.c
+++ b/test/smtp-dummy.c
@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
fprintf (peer, "502 not implemented\r\n");
fflush (peer);
} else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
- fprintf (peer, "250 localhost\r\n");
+ fprintf (peer, "250 127.0.0.1\r\n");
fflush (peer);
} else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
size_t line_size;
ssize_t line_len;
- fprintf (peer, "220 localhost smtp-dummy\r\n");
+ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
fflush (peer);
while ((line_len = getline (&line, &line_size, peer)) != -1) {
@@ -183,9 +183,9 @@ main (int argc, char *argv[])
goto DONE;
}
- hostinfo = gethostbyname ("localhost");
+ hostinfo = gethostbyname ("127.0.0.1");
if (hostinfo == NULL) {
- fprintf (stderr, "Unknown host: localhost\n");
+ fprintf (stderr, "Unknown host: 127.0.0.1\n");
ret = 1;
goto DONE;
}
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 616cb674..dd887773 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -336,7 +336,7 @@ emacs_deliver_message ()
test_emacs \
"(let ((message-send-mail-function 'message-smtpmail-send-it)
(mail-host-address \"example.com\")
- (smtpmail-smtp-server \"localhost\")
+ (smtpmail-smtp-server \"127.0.0.1\")
(smtpmail-smtp-service \"${smtp_dummy_port}\"))
(notmuch-mua-mail)
(message-goto-to)
--
2.19.2

View File

@@ -1,62 +0,0 @@
From 9c15b508819d15d0852d71c2e897550cfaac09ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
<aidecoe@aidecoe.name>
Date: Thu, 7 Mar 2019 22:47:55 +0000
Subject: [PATCH] Use loopback IP address rather than name
With FEATURES="network-sandbox" 'localhost' name lookup fails.
---
test/smtp-dummy.c | 8 ++++----
test/test-lib.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index 71992edd..e72ba2d0 100644
--- a/test/smtp-dummy.c
+++ b/test/smtp-dummy.c
@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
fprintf (peer, "502 not implemented\r\n");
fflush (peer);
} else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
- fprintf (peer, "250 localhost\r\n");
+ fprintf (peer, "250 127.0.0.1\r\n");
fflush (peer);
} else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
size_t line_size;
ssize_t line_len;
- fprintf (peer, "220 localhost smtp-dummy\r\n");
+ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
fflush (peer);
while ((line_len = getline (&line, &line_size, peer)) != -1) {
@@ -182,9 +182,9 @@ main (int argc, char *argv[])
goto DONE;
}
- hostinfo = gethostbyname ("localhost");
+ hostinfo = gethostbyname ("127.0.0.1");
if (hostinfo == NULL) {
- fprintf (stderr, "Unknown host: localhost\n");
+ fprintf (stderr, "Unknown host: 127.0.0.1\n");
ret = 1;
goto DONE;
}
diff --git a/test/test-lib.sh b/test/test-lib.sh
index fca5277d..fa8fd5bd 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -320,7 +320,7 @@ emacs_deliver_message ()
test_emacs \
"(let ((message-send-mail-function 'message-smtpmail-send-it)
(mail-host-address \"example.com\")
- (smtpmail-smtp-server \"localhost\")
+ (smtpmail-smtp-server \"127.0.0.1\")
(smtpmail-smtp-service \"25025\"))
(notmuch-mua-mail)
(message-goto-to)
--
2.19.2

View File

@@ -1,26 +0,0 @@
From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
<aidecoe@aidecoe.name>
Date: Sat, 9 Mar 2019 22:42:21 +0000
Subject: [PATCH 2/2] Fix "jobserver unavailable" warning
---
doc/Makefile.local | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/Makefile.local b/doc/Makefile.local
index bab3d0d2..dfe62295 100644
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@ -56,7 +56,7 @@ sphinx-texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
sphinx-info: sphinx-texinfo
- make -C $(DOCBUILDDIR)/texinfo info
+ $(MAKE) -C $(DOCBUILDDIR)/texinfo info
# Use the man page converter that is available. We should never depend
# on MAN_ROFF_FILES if a converter is not available.
--
2.19.2

View File

@@ -1,232 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DISTUTILS_OPTIONAL=1
PYTHON_COMPAT=( python{2_7,3_6,3_7} )
inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
distutils-r1 toolchain-funcs
DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
HOMEPAGE="https://notmuchmail.org/"
SRC_URI="https://notmuchmail.org/releases/${P}.tar.gz
test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
LICENSE="GPL-3"
# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
# meant to be binary backward compatible.
SLOT="0/5"
KEYWORDS="~alpha amd64 x86 ~x64-solaris"
REQUIRED_USE="
nmbug? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
test? ( crypt emacs python valgrind )
"
IUSE="crypt doc emacs mutt nmbug python test valgrind"
RESTRICT="!test? ( test )"
CDEPEND="
!!<app-shells/bash-completion-1.9
>=dev-libs/glib-2.22:2
>=dev-libs/gmime-3.0.3:3.0
>=dev-libs/xapian-1.4.8:=
dev-python/sphinx[${PYTHON_USEDEP}]
sys-apps/texinfo
>=sys-libs/zlib-1.2.5.2
sys-libs/talloc
crypt? ( dev-libs/gmime:3.0[crypt] )
emacs? ( >=app-editors/emacs-24.1:* )
python? ( ${PYTHON_DEPS} )
"
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? (
app-doc/doxygen
dev-python/mock[${PYTHON_USEDEP}]
)
test? (
app-misc/dtach
>=app-editors/emacs-24.1:*[libxml2]
sys-devel/gdb
crypt? ( app-crypt/gnupg dev-libs/openssl )
)
valgrind? ( dev-util/valgrind )
"
RDEPEND="${CDEPEND}
crypt? ( app-crypt/gnupg )
nmbug? ( dev-vcs/git )
mutt? (
dev-perl/File-Which
dev-perl/Mail-Box
dev-perl/MailTools
dev-perl/String-ShellQuote
dev-perl/Term-ReadLine-Gnu
virtual/perl-Digest-SHA
virtual/perl-File-Path
virtual/perl-Getopt-Long
virtual/perl-Pod-Parser
)
"
DOCS=( AUTHORS NEWS README )
NEED_EMACS="24.1"
SITEFILE="50${PN}-gentoo.el"
MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
PATCHES=(
"${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
"${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
)
bindings() {
local ret=0
if use $1; then
pushd bindings/$1 || die
shift
"$@"
ret=$?
popd || die
fi
return $ret
}
pkg_pretend() {
if has_version '<net-mail/notmuch-0.18'; then
ewarn
ewarn "There are few not backward compatible changes between"
ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
ewarn "(0.18 section) for details before first use!"
ewarn
fi
}
pkg_setup() {
use emacs && elisp-check-emacs-version
}
src_unpack() {
unpack "${P}".tar.gz
if use test; then
mkdir -p "${S}"/test/test-databases || die
cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
fi
}
src_prepare() {
default
bindings python distutils-r1_src_prepare
bindings python mv README README-python || die
mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
# assure that new Makefile.config will be generated
rm -f Makefile.config || die
sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
if use test; then
append-cflags -g
append-cxxflags -g
fi
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
}
src_configure() {
python_setup # for sphinx
local myeconfargs=(
--bashcompletiondir="$(get_bashcompdir)"
--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
--without-desktop
--without-ruby
--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
$(use_with emacs)
$(use_with doc api-docs)
)
tc-export CC CXX
econf "${myeconfargs[@]}"
}
src_compile() {
python_setup # for sphinx
V=1 default
bindings python distutils-r1_src_compile
if use mutt; then
pushd contrib/notmuch-mutt || die
emake notmuch-mutt.1
popd || die
fi
if use doc; then
pydocs() {
pushd docs || die
emake html
rm -r html/_sources || die
rm html/{objects.inv,.buildinfo} || die
mkdir -p ../html && mv html ../html/python || die
popd || die
}
LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
fi
}
src_test() {
pax-mark -m notmuch
LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
pax-mark -ze notmuch
}
src_install() {
default
if use doc; then
doman doc/_build/man/man?/*.?
fi
if use emacs; then
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
fi
if use nmbug; then
dobin devel/nmbug/nmbug
dobin devel/nmbug/notmuch-report
fi
if use mutt; then
pushd contrib/notmuch-mutt || die
dobin notmuch-mutt
doman notmuch-mutt.1
insinto /etc/mutt
doins notmuch-mutt.rc
dodoc README-mutt
popd || die
fi
DOCS="" bindings python distutils-r1_src_install
use doc && bindings python dodoc -r html
}
pkg_preinst() {
if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
elog "To enable notmuch support in mutt, add the following line into"
elog "your mutt config file, please:"
elog ""
elog " source /etc/mutt/notmuch-mutt.rc"
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

View File

@@ -1,233 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DISTUTILS_OPTIONAL=1
PYTHON_COMPAT=( python{2_7,3_6,3_7} )
inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
distutils-r1 toolchain-funcs
DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
HOMEPAGE="https://notmuchmail.org/"
SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
LICENSE="GPL-3"
# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
# meant to be binary backward compatible.
SLOT="0/5"
KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
REQUIRED_USE="
nmbug? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
test? ( crypt emacs python valgrind )
"
IUSE="crypt doc emacs mutt nmbug python test valgrind"
RESTRICT="!test? ( test )"
CDEPEND="
!!<app-shells/bash-completion-1.9
>=dev-libs/glib-2.22:2
>=dev-libs/gmime-3.0.3:3.0
>=dev-libs/xapian-1.4.8:=
dev-python/sphinx
sys-apps/texinfo
>=sys-libs/zlib-1.2.5.2
sys-libs/talloc
crypt? ( dev-libs/gmime:3.0[crypt] )
emacs? ( >=app-editors/emacs-24.1:* )
python? ( ${PYTHON_DEPS} )
"
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? (
app-doc/doxygen
dev-python/mock[${PYTHON_USEDEP}]
)
test? (
app-misc/dtach
>=app-editors/emacs-24.1:*[libxml2]
sys-devel/gdb
crypt? ( app-crypt/gnupg dev-libs/openssl )
)
valgrind? ( dev-util/valgrind )
"
RDEPEND="${CDEPEND}
crypt? ( app-crypt/gnupg )
nmbug? ( dev-vcs/git )
mutt? (
dev-perl/File-Which
dev-perl/Mail-Box
dev-perl/MailTools
dev-perl/String-ShellQuote
dev-perl/Term-ReadLine-Gnu
virtual/perl-Digest-SHA
virtual/perl-File-Path
virtual/perl-Getopt-Long
virtual/perl-Pod-Parser
)
"
DOCS=( AUTHORS NEWS README )
NEED_EMACS="24.1"
SITEFILE="50${PN}-gentoo.el"
MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
PATCHES=(
"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
)
bindings() {
local ret=0
if use $1; then
pushd bindings/$1 || die
shift
"$@"
ret=$?
popd || die
fi
return $ret
}
pkg_pretend() {
if has_version '<net-mail/notmuch-0.18'; then
ewarn
ewarn "There are few not backward compatible changes between"
ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
ewarn "(0.18 section) for details before first use!"
ewarn
fi
}
pkg_setup() {
use emacs && elisp-check-emacs-version
}
src_unpack() {
unpack "${P}".tar.xz
if use test; then
mkdir -p "${S}"/test/test-databases || die
cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
fi
}
src_prepare() {
default
bindings python distutils-r1_src_prepare
bindings python mv README README-python || die
mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
# assure that new Makefile.config will be generated
rm -f Makefile.config || die
sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
if use test; then
append-cflags -g
append-cxxflags -g
fi
if [[ ${CHOST} == *-solaris* ]] ; then
append-ldflags -lnsl -lsocket # non-autoconf configure
fi
}
src_configure() {
python_setup # for sphinx
local myeconfargs=(
--bashcompletiondir="$(get_bashcompdir)"
--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
--without-desktop
--without-ruby
--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
$(use_with emacs)
$(use_with doc api-docs)
)
tc-export CC CXX
econf "${myeconfargs[@]}"
}
src_compile() {
python_setup # for sphinx
V=1 default
bindings python distutils-r1_src_compile
if use mutt; then
pushd contrib/notmuch-mutt || die
emake notmuch-mutt.1
popd || die
fi
if use doc; then
pydocs() {
pushd docs || die
emake html
rm -r html/_sources || die
rm html/{objects.inv,.buildinfo} || die
mkdir -p ../html && mv html ../html/python || die
popd || die
}
LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
fi
}
src_test() {
pax-mark -m notmuch
LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
pax-mark -ze notmuch
}
src_install() {
default
if use doc; then
doman doc/_build/man/man?/*.?
fi
if use emacs; then
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
fi
if use nmbug; then
dobin devel/nmbug/nmbug
dobin devel/nmbug/notmuch-report
fi
if use mutt; then
pushd contrib/notmuch-mutt || die
dobin notmuch-mutt
doman notmuch-mutt.1
insinto /etc/mutt
doins notmuch-mutt.rc
dodoc README-mutt
popd || die
fi
DOCS="" bindings python distutils-r1_src_install
use doc && bindings python dodoc -r html
}
pkg_preinst() {
if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
elog "To enable notmuch support in mutt, add the following line into"
elog "your mutt config file, please:"
elog ""
elog " source /etc/mutt/notmuch-mutt.rc"
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}