* [gentoo-commits] repo/gentoo:master commit in: mail-client/mailx/, mail-client/mailx/files/
@ 2018-05-26 14:09 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2018-05-26 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 4958a02fad4303587c98a4025bf6c5c088e31226
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 14:08:58 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 26 14:08:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4958a02f
mail-client/mailx: drop vulnerable
Bug: https://bugs.gentoo.org/533208
Package-Manager: Portage-2.3.40, Repoman-2.3.9
mail-client/mailx/Manifest | 2 -
.../mailx/files/mailx-8.1.2.20050715-nostrip.patch | 22 -------
mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild | 71 ----------------------
3 files changed, 95 deletions(-)
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 3e92f4376e6..7a1436c1390 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,4 +1,2 @@
DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
-DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
-DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
deleted file mode 100644
index 14a05ba4d6d..00000000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mailx-8.1.2-0.20050715cvs.orig/Makefile
-===================================================================
---- mailx-8.1.2-0.20050715cvs.orig.orig/Makefile
-+++ mailx-8.1.2-0.20050715cvs.orig/Makefile
-@@ -3,16 +3,7 @@
- PROG=mail
- CC=gcc
-
--CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
--
--ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-- CFLAGS += -O0
--else
-- CFLAGS += -O2
--endif
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-- LDFLAGS += -s
--endif
-+CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT ${EXTRAFLAGS}
-
- SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
- edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
deleted file mode 100644
index c51ce8d07a7..00000000000
--- a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MX_MAJ_VER=${PV%.*}
-MX_MIN_VER=${PV##*.}
-MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
-S=${WORKDIR}/${PN}-${MY_PV}.orig/
-debian_patch=${PN}_${MY_PV}-1.diff.gz
-
-DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
- mirror://gentoo/${debian_patch}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=net-libs/liblockfile-1.03
- virtual/mta
- mail-client/mailx-support"
-
-RDEPEND="${DEPEND}
- !mail-client/nail
- !net-mail/mailutils"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${DISTDIR}/${debian_patch}"
- epatch "${FILESDIR}/${P}-nostrip.patch"
- sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
- epatch "${FILESDIR}/${P}-offsetof.patch"
-}
-
-src_compile() {
- emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- dodir /usr/bin /bin /usr/share/man/man1 /etc
-
- insinto /usr/bin
- insopts -m 755
- doins mail || die
-
- doman mail.1
-
- dosym mail /usr/bin/Mail
- dosym mail /usr/bin/mailx
- dosym mail.1 /usr/share/man/man1/Mail.1
-
- insinto /usr/share/mailx/
- doins misc/mail.help misc/mail.tildehelp || die
- insinto /etc
- insopts -m 644
- doins misc/mail.rc || die
-
- # compatibility link
- dosym /usr/bin/mail /bin/mail || die
-}
-
-pkg_postinst() {
- elog "mail command now lives in /usr/bin."
- elog "Please adjust your scripts."
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mailx/, mail-client/mailx/files/
@ 2022-06-24 3:43 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-24 3:43 UTC (permalink / raw
To: gentoo-commits
commit: 5dd27f1032275822f8303e9c5f48919a7e80bd6f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 01:58:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 03:13:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd27f10
mail-client/mailx: fix build on musl
Thanks-to: CFuga <cfuga <AT> cfuga.mx>
Closes: https://bugs.gentoo.org/719512
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch | 17 +++++++++++++++++
mail-client/mailx/mailx-8.1.2.20180807.ebuild | 1 +
2 files changed, 18 insertions(+)
diff --git a/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch b/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch
new file mode 100644
index 000000000000..d04ddd789e3a
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/719512
+
+Tiny definition copied from /usr/include/termios.h.
+--- a/tty.c
++++ b/tty.c
+@@ -57,6 +57,10 @@
+ size_t cursor;
+ };
+
++#ifndef CCEQ
++#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
++#endif
++
+ static void tty_flush(struct tty *);
+ static int tty_getc(struct tty *);
+ static int tty_insert(struct tty *, int, int);
+
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index d542d75a55b2..4b3f28a1d294 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
eapply "${WORKDIR}/debian/patches"
eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
eapply "${FILESDIR}/${PN}-8.1.2.20180807-fno-common.patch"
+ eapply "${FILESDIR}/${PN}-8.1.2-20180807-musl-CCEQ.patch"
eapply_user
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-24 3:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-24 3:43 [gentoo-commits] repo/gentoo:master commit in: mail-client/mailx/, mail-client/mailx/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-26 14:09 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox