Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mailx/, mail-client/mailx/files/
Date: Sat, 26 May 2018 14:09:16
Message-Id: 1527343738.4958a02fad4303587c98a4025bf6c5c088e31226.bman@gentoo
1 commit: 4958a02fad4303587c98a4025bf6c5c088e31226
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 26 14:08:58 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat May 26 14:08:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4958a02f
7
8 mail-client/mailx: drop vulnerable
9
10 Bug: https://bugs.gentoo.org/533208
11 Package-Manager: Portage-2.3.40, Repoman-2.3.9
12
13 mail-client/mailx/Manifest | 2 -
14 .../mailx/files/mailx-8.1.2.20050715-nostrip.patch | 22 -------
15 mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild | 71 ----------------------
16 3 files changed, 95 deletions(-)
17
18 diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
19 index 3e92f4376e6..7a1436c1390 100644
20 --- a/mail-client/mailx/Manifest
21 +++ b/mail-client/mailx/Manifest
22 @@ -1,4 +1,2 @@
23 DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
24 DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
25 -DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
26 -DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
27
28 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
29 deleted file mode 100644
30 index 14a05ba4d6d..00000000000
31 --- a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
32 +++ /dev/null
33 @@ -1,22 +0,0 @@
34 -Index: mailx-8.1.2-0.20050715cvs.orig/Makefile
35 -===================================================================
36 ---- mailx-8.1.2-0.20050715cvs.orig.orig/Makefile
37 -+++ mailx-8.1.2-0.20050715cvs.orig/Makefile
38 -@@ -3,16 +3,7 @@
39 - PROG=mail
40 - CC=gcc
41 -
42 --CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
43 --
44 --ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
45 -- CFLAGS += -O0
46 --else
47 -- CFLAGS += -O2
48 --endif
49 --ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
50 -- LDFLAGS += -s
51 --endif
52 -+CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT ${EXTRAFLAGS}
53 -
54 - SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
55 - edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
56
57 diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
58 deleted file mode 100644
59 index c51ce8d07a7..00000000000
60 --- a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
61 +++ /dev/null
62 @@ -1,71 +0,0 @@
63 -# Copyright 1999-2018 Gentoo Foundation
64 -# Distributed under the terms of the GNU General Public License v2
65 -
66 -EAPI=0
67 -
68 -inherit eutils flag-o-matic toolchain-funcs
69 -
70 -MX_MAJ_VER=${PV%.*}
71 -MX_MIN_VER=${PV##*.}
72 -MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
73 -S=${WORKDIR}/${PN}-${MY_PV}.orig/
74 -debian_patch=${PN}_${MY_PV}-1.diff.gz
75 -
76 -DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
77 -HOMEPAGE="http://www.debian.org/"
78 -SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
79 - mirror://gentoo/${debian_patch}"
80 -
81 -LICENSE="BSD"
82 -SLOT="0"
83 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
84 -IUSE=""
85 -
86 -DEPEND=">=net-libs/liblockfile-1.03
87 - virtual/mta
88 - mail-client/mailx-support"
89 -
90 -RDEPEND="${DEPEND}
91 - !mail-client/nail
92 - !net-mail/mailutils"
93 -
94 -src_unpack() {
95 - unpack ${A}
96 - cd "${S}"
97 - epatch "${DISTDIR}/${debian_patch}"
98 - epatch "${FILESDIR}/${P}-nostrip.patch"
99 - sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
100 - epatch "${FILESDIR}/${P}-offsetof.patch"
101 -}
102 -
103 -src_compile() {
104 - emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
105 -}
106 -
107 -src_install() {
108 - dodir /usr/bin /bin /usr/share/man/man1 /etc
109 -
110 - insinto /usr/bin
111 - insopts -m 755
112 - doins mail || die
113 -
114 - doman mail.1
115 -
116 - dosym mail /usr/bin/Mail
117 - dosym mail /usr/bin/mailx
118 - dosym mail.1 /usr/share/man/man1/Mail.1
119 -
120 - insinto /usr/share/mailx/
121 - doins misc/mail.help misc/mail.tildehelp || die
122 - insinto /etc
123 - insopts -m 644
124 - doins misc/mail.rc || die
125 -
126 - # compatibility link
127 - dosym /usr/bin/mail /bin/mail || die
128 -}
129 -
130 -pkg_postinst() {
131 - elog "mail command now lives in /usr/bin."
132 - elog "Please adjust your scripts."
133 -}