* [gentoo-commits] repo/proj/guru:dev commit in: mail-client/heirloom-mailx/, mail-client/heirloom-mailx/files/, profiles/
@ 2024-10-22 9:27 David Roman
2024-10-22 9:31 ` [gentoo-commits] repo/proj/guru:master commit in: mail-client/heirloom-mailx/files/, profiles/, mail-client/heirloom-mailx/ David Roman
0 siblings, 1 reply; 2+ messages in thread
From: David Roman @ 2024-10-22 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 4331750130792e20b169ff289ca48449b10ccfd0
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 09:27:41 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Oct 22 09:27:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=43317501
mail-client/heirloom-mailx: treeclean
Closes: https://bugs.gentoo.org/901281
Closes: https://bugs.gentoo.org/816783
Closes: https://bugs.gentoo.org/785409
Closes: https://bugs.gentoo.org/782964
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
mail-client/heirloom-mailx/Manifest | 1 -
.../files/heirloom-mailx-12.5-enable-ldflags.patch | 12 --
.../files/heirloom-mailx-12.5-fixes-1.patch | 232 ---------------------
.../heirloom-mailx/heirloom-mailx-12.5.ebuild | 42 ----
mail-client/heirloom-mailx/metadata.xml | 8 -
profiles/package.mask | 5 -
6 files changed, 300 deletions(-)
diff --git a/mail-client/heirloom-mailx/Manifest b/mail-client/heirloom-mailx/Manifest
deleted file mode 100644
index f70413e5a..000000000
--- a/mail-client/heirloom-mailx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f
diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch
deleted file mode 100644
index 8313a7fb3..000000000
--- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur heirloom-mailx-12.5/Makefile heirloom-mailx-12.5-patch/Makefile
---- heirloom-mailx-12.5/Makefile 2011-04-26 23:23:22.000000000 +0200
-+++ heirloom-mailx-12.5-patch/Makefile 2021-08-08 21:58:46.965043853 +0200
-@@ -25,7 +25,7 @@
- # displayed correctly.
- #CFLAGS =
- #CPPFLAGS =
--#LDFLAGS =
-+LDFLAGS =
- #WARN = -Wall -Wno-parentheses -Werror
-
- # Some RedHat versions need INCLUDES = -I/usr/kerberos/include to compile
diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
deleted file mode 100644
index fa6d51197..000000000
--- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2014-12-27
-Initial Package Version: 12.5
-Upstream Status: Unknown
-Origin: Changes to remove SSL2 found at debian, remainder from redhat.
-Description: Removes support for SSL2 (openssl no longer supports it)
-and fixes CVE-2004-2771 [sic] and CVE-2014-7844.
-
-diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h
---- heirloom-mailx-12.5/extern.h 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/extern.h 2014-12-27 01:26:59.654169487 +0000
-@@ -396,7 +396,7 @@
- int is_fileaddr(char *name);
- struct name *usermap(struct name *names);
- struct name *cat(struct name *n1, struct name *n2);
--char **unpack(struct name *np);
-+char **unpack(struct name *smopts, struct name *np);
- struct name *elide(struct name *names);
- int count(struct name *np);
- struct name *delete_alternates(struct name *np);
-diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c
---- heirloom-mailx-12.5/fio.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/fio.c 2014-12-27 01:27:15.634561413 +0000
-@@ -43,12 +43,15 @@
- #endif /* not lint */
-
- #include "rcv.h"
-+
-+#ifndef HAVE_WORDEXP
-+#error wordexp support is required
-+#endif
-+
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#ifdef HAVE_WORDEXP
- #include <wordexp.h>
--#endif /* HAVE_WORDEXP */
- #include <unistd.h>
-
- #if defined (USE_NSS)
-@@ -481,7 +484,6 @@
- static char *
- globname(char *name)
- {
--#ifdef HAVE_WORDEXP
- wordexp_t we;
- char *cp;
- sigset_t nset;
-@@ -495,7 +497,7 @@
- sigemptyset(&nset);
- sigaddset(&nset, SIGCHLD);
- sigprocmask(SIG_BLOCK, &nset, NULL);
-- i = wordexp(name, &we, 0);
-+ i = wordexp(name, &we, WRDE_NOCMD);
- sigprocmask(SIG_UNBLOCK, &nset, NULL);
- switch (i) {
- case 0:
-@@ -527,65 +529,6 @@
- }
- wordfree(&we);
- return cp;
--#else /* !HAVE_WORDEXP */
-- char xname[PATHSIZE];
-- char cmdbuf[PATHSIZE]; /* also used for file names */
-- int pid, l;
-- char *cp, *shell;
-- int pivec[2];
-- extern int wait_status;
-- struct stat sbuf;
--
-- if (pipe(pivec) < 0) {
-- perror("pipe");
-- return name;
-- }
-- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
-- if ((shell = value("SHELL")) == NULL)
-- shell = SHELL;
-- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
-- if (pid < 0) {
-- close(pivec[0]);
-- close(pivec[1]);
-- return NULL;
-- }
-- close(pivec[1]);
--again:
-- l = read(pivec[0], xname, sizeof xname);
-- if (l < 0) {
-- if (errno == EINTR)
-- goto again;
-- perror("read");
-- close(pivec[0]);
-- return NULL;
-- }
-- close(pivec[0]);
-- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
-- fprintf(stderr, catgets(catd, CATSET, 81,
-- "\"%s\": Expansion failed.\n"), name);
-- return NULL;
-- }
-- if (l == 0) {
-- fprintf(stderr, catgets(catd, CATSET, 82,
-- "\"%s\": No match.\n"), name);
-- return NULL;
-- }
-- if (l == sizeof xname) {
-- fprintf(stderr, catgets(catd, CATSET, 83,
-- "\"%s\": Expansion buffer overflow.\n"), name);
-- return NULL;
-- }
-- xname[l] = 0;
-- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
-- ;
-- cp[1] = '\0';
-- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
-- fprintf(stderr, catgets(catd, CATSET, 84,
-- "\"%s\": Ambiguous.\n"), name);
-- return NULL;
-- }
-- return savestr(xname);
--#endif /* !HAVE_WORDEXP */
- }
-
- /*
-diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1
---- heirloom-mailx-12.5/mailx.1 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/mailx.1 2014-12-27 01:26:53.838026857 +0000
-@@ -656,6 +656,14 @@
- will have the system wide alias expanded
- as all mail goes through sendmail.
- .SS "Recipient address specifications"
-+If the
-+.I expandaddr
-+option is not set (the default), recipient addresses must be names of
-+local mailboxes or Internet mail addresses.
-+.PP
-+If the
-+.I expandaddr
-+option is set, the following rules apply:
- When an address is used to name a recipient
- (in any of To, Cc, or Bcc),
- names of local mail folders
-@@ -2391,6 +2399,12 @@
- If this option is set,
- \fImailx\fR starts even with an empty mailbox.
- .TP
-+.B expandaddr
-+Causes
-+.I mailx
-+to expand message recipient addresses, as explained in the section,
-+Recipient address specifications.
-+.TP
- .B flipr
- Exchanges the
- .I Respond
-@@ -3575,7 +3589,7 @@
- .TP
- .B ssl-method
- Selects a SSL/TLS protocol version;
--valid values are `ssl2', `ssl3', and `tls1'.
-+valid values are `ssl3', and `tls1'.
- If unset, the method is selected automatically,
- if possible.
- .TP
-diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c
---- heirloom-mailx-12.5/names.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/names.c 2014-12-27 01:26:59.654169487 +0000
-@@ -268,6 +268,9 @@
- FILE *fout, *fin;
- int ispipe;
-
-+ if (value("expandaddr") == NULL)
-+ return names;
-+
- top = names;
- np = names;
- time(&now);
-@@ -546,7 +549,7 @@
- * Return an error if the name list won't fit.
- */
- char **
--unpack(struct name *np)
-+unpack(struct name *smopts, struct name *np)
- {
- char **ap, **top;
- struct name *n;
-@@ -561,7 +564,7 @@
- * the terminating 0 pointer. Additional spots may be needed
- * to pass along -f to the host mailer.
- */
-- extra = 2;
-+ extra = 3 + count(smopts);
- extra++;
- metoo = value("metoo") != NULL;
- if (metoo)
-@@ -578,6 +581,10 @@
- *ap++ = "-m";
- if (verbose)
- *ap++ = "-v";
-+ for (; smopts != NULL; smopts = smopts->n_flink)
-+ if ((smopts->n_type & GDEL) == 0)
-+ *ap++ = smopts->n_name;
-+ *ap++ = "--";
- for (; n != NULL; n = n->n_flink)
- if ((n->n_type & GDEL) == 0)
- *ap++ = n->n_name;
-diff -Naur heirloom-mailx-12.5/openssl.c heirloom-mailx-12.5-patched/openssl.c
---- heirloom-mailx-12.5/openssl.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/openssl.c 2014-12-27 01:26:34.385549867 +0000
-@@ -216,9 +216,7 @@
-
- cp = ssl_method_string(uhp);
- if (cp != NULL) {
-- if (equal(cp, "ssl2"))
-- method = SSLv2_client_method();
-- else if (equal(cp, "ssl3"))
-+ if (equal(cp, "ssl3"))
- method = SSLv3_client_method();
- else if (equal(cp, "tls1"))
- method = TLSv1_client_method();
-diff -Naur heirloom-mailx-12.5/sendout.c heirloom-mailx-12.5-patched/sendout.c
---- heirloom-mailx-12.5/sendout.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/sendout.c 2014-12-27 01:26:59.654169487 +0000
-@@ -835,7 +835,7 @@
- #endif /* HAVE_SOCKETS */
-
- if ((smtp = value("smtp")) == NULL) {
-- args = unpack(cat(mailargs, to));
-+ args = unpack(mailargs, to);
- if (debug || value("debug")) {
- printf(catgets(catd, CATSET, 181,
- "Sendmail arguments:"));
diff --git a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
deleted file mode 100644
index 236b33190..000000000
--- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The mailx utility from CentOS"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="net-libs/liblockfile
- dev-libs/libbsd
- sys-libs/binutils-libs
- virtual/mta
- mail-client/mailx-support
- dev-libs/openssl"
-
-RDEPEND="${DEPEND}
- !virtual/mailx
- !mail-client/nail
- !net-mail/mailutils
- !mail-client/mailx"
-
-src_prepare() {
- eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch"
- eapply -p1 "${FILESDIR}/${PN}-${PVR}-enable-ldflags.patch"
- eapply_user
-}
-
-src_compile(){
- sed 's@<openssl@<openssl-1.0/openssl@' -i openssl.c fio.c makeconfig
- emake LDFLAGS="${LDFLAGS}" LDFLAGS+="-L /usr/lib/openssl-1.0/" SENDMAIL=/usr/sbin/sendmail
-}
-
-src_install(){
- emake PREFIX="${D}/usr" SYSCONFDIR="${D}/etc" UCBINSTALL="/usr/bin/install" install
- install -v -m755 -d "${D}/usr/share/doc/heirloom-mailx-12.5"
- install -v -m644 README "${D}/usr/share/doc/heirloom-mailx-12.5"
-}
diff --git a/mail-client/heirloom-mailx/metadata.xml b/mail-client/heirloom-mailx/metadata.xml
deleted file mode 100644
index 3be410e17..000000000
--- a/mail-client/heirloom-mailx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>y0rune@aol.com</email>
- <name>Marcin Woźniak</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 37ed793cb..0ea08a6a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -113,11 +113,6 @@ sys-firmware/pinephone-firmware
# Removal on 2024-10-22.
net-im/ruqola
-# David Roman <davidroman96@gmail.com> (2024-09-21)
-# Dead SRC_URI. Not much maintained downstream
-# Removal on 2024-10-21
-mail-client/heirloom-mailx
-
# Julien Roy <julien@jroy.ca> (2024-03-21)
# sys-libs/libucontext is masked in ::gentoo
sys-libs/gcompat
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: mail-client/heirloom-mailx/files/, profiles/, mail-client/heirloom-mailx/
2024-10-22 9:27 [gentoo-commits] repo/proj/guru:dev commit in: mail-client/heirloom-mailx/, mail-client/heirloom-mailx/files/, profiles/ David Roman
@ 2024-10-22 9:31 ` David Roman
0 siblings, 0 replies; 2+ messages in thread
From: David Roman @ 2024-10-22 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 4331750130792e20b169ff289ca48449b10ccfd0
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 09:27:41 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Oct 22 09:27:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=43317501
mail-client/heirloom-mailx: treeclean
Closes: https://bugs.gentoo.org/901281
Closes: https://bugs.gentoo.org/816783
Closes: https://bugs.gentoo.org/785409
Closes: https://bugs.gentoo.org/782964
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
mail-client/heirloom-mailx/Manifest | 1 -
.../files/heirloom-mailx-12.5-enable-ldflags.patch | 12 --
.../files/heirloom-mailx-12.5-fixes-1.patch | 232 ---------------------
.../heirloom-mailx/heirloom-mailx-12.5.ebuild | 42 ----
mail-client/heirloom-mailx/metadata.xml | 8 -
profiles/package.mask | 5 -
6 files changed, 300 deletions(-)
diff --git a/mail-client/heirloom-mailx/Manifest b/mail-client/heirloom-mailx/Manifest
deleted file mode 100644
index f70413e5a..000000000
--- a/mail-client/heirloom-mailx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f
diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch
deleted file mode 100644
index 8313a7fb3..000000000
--- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur heirloom-mailx-12.5/Makefile heirloom-mailx-12.5-patch/Makefile
---- heirloom-mailx-12.5/Makefile 2011-04-26 23:23:22.000000000 +0200
-+++ heirloom-mailx-12.5-patch/Makefile 2021-08-08 21:58:46.965043853 +0200
-@@ -25,7 +25,7 @@
- # displayed correctly.
- #CFLAGS =
- #CPPFLAGS =
--#LDFLAGS =
-+LDFLAGS =
- #WARN = -Wall -Wno-parentheses -Werror
-
- # Some RedHat versions need INCLUDES = -I/usr/kerberos/include to compile
diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
deleted file mode 100644
index fa6d51197..000000000
--- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2014-12-27
-Initial Package Version: 12.5
-Upstream Status: Unknown
-Origin: Changes to remove SSL2 found at debian, remainder from redhat.
-Description: Removes support for SSL2 (openssl no longer supports it)
-and fixes CVE-2004-2771 [sic] and CVE-2014-7844.
-
-diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h
---- heirloom-mailx-12.5/extern.h 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/extern.h 2014-12-27 01:26:59.654169487 +0000
-@@ -396,7 +396,7 @@
- int is_fileaddr(char *name);
- struct name *usermap(struct name *names);
- struct name *cat(struct name *n1, struct name *n2);
--char **unpack(struct name *np);
-+char **unpack(struct name *smopts, struct name *np);
- struct name *elide(struct name *names);
- int count(struct name *np);
- struct name *delete_alternates(struct name *np);
-diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c
---- heirloom-mailx-12.5/fio.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/fio.c 2014-12-27 01:27:15.634561413 +0000
-@@ -43,12 +43,15 @@
- #endif /* not lint */
-
- #include "rcv.h"
-+
-+#ifndef HAVE_WORDEXP
-+#error wordexp support is required
-+#endif
-+
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#ifdef HAVE_WORDEXP
- #include <wordexp.h>
--#endif /* HAVE_WORDEXP */
- #include <unistd.h>
-
- #if defined (USE_NSS)
-@@ -481,7 +484,6 @@
- static char *
- globname(char *name)
- {
--#ifdef HAVE_WORDEXP
- wordexp_t we;
- char *cp;
- sigset_t nset;
-@@ -495,7 +497,7 @@
- sigemptyset(&nset);
- sigaddset(&nset, SIGCHLD);
- sigprocmask(SIG_BLOCK, &nset, NULL);
-- i = wordexp(name, &we, 0);
-+ i = wordexp(name, &we, WRDE_NOCMD);
- sigprocmask(SIG_UNBLOCK, &nset, NULL);
- switch (i) {
- case 0:
-@@ -527,65 +529,6 @@
- }
- wordfree(&we);
- return cp;
--#else /* !HAVE_WORDEXP */
-- char xname[PATHSIZE];
-- char cmdbuf[PATHSIZE]; /* also used for file names */
-- int pid, l;
-- char *cp, *shell;
-- int pivec[2];
-- extern int wait_status;
-- struct stat sbuf;
--
-- if (pipe(pivec) < 0) {
-- perror("pipe");
-- return name;
-- }
-- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
-- if ((shell = value("SHELL")) == NULL)
-- shell = SHELL;
-- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
-- if (pid < 0) {
-- close(pivec[0]);
-- close(pivec[1]);
-- return NULL;
-- }
-- close(pivec[1]);
--again:
-- l = read(pivec[0], xname, sizeof xname);
-- if (l < 0) {
-- if (errno == EINTR)
-- goto again;
-- perror("read");
-- close(pivec[0]);
-- return NULL;
-- }
-- close(pivec[0]);
-- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
-- fprintf(stderr, catgets(catd, CATSET, 81,
-- "\"%s\": Expansion failed.\n"), name);
-- return NULL;
-- }
-- if (l == 0) {
-- fprintf(stderr, catgets(catd, CATSET, 82,
-- "\"%s\": No match.\n"), name);
-- return NULL;
-- }
-- if (l == sizeof xname) {
-- fprintf(stderr, catgets(catd, CATSET, 83,
-- "\"%s\": Expansion buffer overflow.\n"), name);
-- return NULL;
-- }
-- xname[l] = 0;
-- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
-- ;
-- cp[1] = '\0';
-- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
-- fprintf(stderr, catgets(catd, CATSET, 84,
-- "\"%s\": Ambiguous.\n"), name);
-- return NULL;
-- }
-- return savestr(xname);
--#endif /* !HAVE_WORDEXP */
- }
-
- /*
-diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1
---- heirloom-mailx-12.5/mailx.1 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/mailx.1 2014-12-27 01:26:53.838026857 +0000
-@@ -656,6 +656,14 @@
- will have the system wide alias expanded
- as all mail goes through sendmail.
- .SS "Recipient address specifications"
-+If the
-+.I expandaddr
-+option is not set (the default), recipient addresses must be names of
-+local mailboxes or Internet mail addresses.
-+.PP
-+If the
-+.I expandaddr
-+option is set, the following rules apply:
- When an address is used to name a recipient
- (in any of To, Cc, or Bcc),
- names of local mail folders
-@@ -2391,6 +2399,12 @@
- If this option is set,
- \fImailx\fR starts even with an empty mailbox.
- .TP
-+.B expandaddr
-+Causes
-+.I mailx
-+to expand message recipient addresses, as explained in the section,
-+Recipient address specifications.
-+.TP
- .B flipr
- Exchanges the
- .I Respond
-@@ -3575,7 +3589,7 @@
- .TP
- .B ssl-method
- Selects a SSL/TLS protocol version;
--valid values are `ssl2', `ssl3', and `tls1'.
-+valid values are `ssl3', and `tls1'.
- If unset, the method is selected automatically,
- if possible.
- .TP
-diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c
---- heirloom-mailx-12.5/names.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/names.c 2014-12-27 01:26:59.654169487 +0000
-@@ -268,6 +268,9 @@
- FILE *fout, *fin;
- int ispipe;
-
-+ if (value("expandaddr") == NULL)
-+ return names;
-+
- top = names;
- np = names;
- time(&now);
-@@ -546,7 +549,7 @@
- * Return an error if the name list won't fit.
- */
- char **
--unpack(struct name *np)
-+unpack(struct name *smopts, struct name *np)
- {
- char **ap, **top;
- struct name *n;
-@@ -561,7 +564,7 @@
- * the terminating 0 pointer. Additional spots may be needed
- * to pass along -f to the host mailer.
- */
-- extra = 2;
-+ extra = 3 + count(smopts);
- extra++;
- metoo = value("metoo") != NULL;
- if (metoo)
-@@ -578,6 +581,10 @@
- *ap++ = "-m";
- if (verbose)
- *ap++ = "-v";
-+ for (; smopts != NULL; smopts = smopts->n_flink)
-+ if ((smopts->n_type & GDEL) == 0)
-+ *ap++ = smopts->n_name;
-+ *ap++ = "--";
- for (; n != NULL; n = n->n_flink)
- if ((n->n_type & GDEL) == 0)
- *ap++ = n->n_name;
-diff -Naur heirloom-mailx-12.5/openssl.c heirloom-mailx-12.5-patched/openssl.c
---- heirloom-mailx-12.5/openssl.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/openssl.c 2014-12-27 01:26:34.385549867 +0000
-@@ -216,9 +216,7 @@
-
- cp = ssl_method_string(uhp);
- if (cp != NULL) {
-- if (equal(cp, "ssl2"))
-- method = SSLv2_client_method();
-- else if (equal(cp, "ssl3"))
-+ if (equal(cp, "ssl3"))
- method = SSLv3_client_method();
- else if (equal(cp, "tls1"))
- method = TLSv1_client_method();
-diff -Naur heirloom-mailx-12.5/sendout.c heirloom-mailx-12.5-patched/sendout.c
---- heirloom-mailx-12.5/sendout.c 2011-04-26 22:23:22.000000000 +0100
-+++ heirloom-mailx-12.5-patched/sendout.c 2014-12-27 01:26:59.654169487 +0000
-@@ -835,7 +835,7 @@
- #endif /* HAVE_SOCKETS */
-
- if ((smtp = value("smtp")) == NULL) {
-- args = unpack(cat(mailargs, to));
-+ args = unpack(mailargs, to);
- if (debug || value("debug")) {
- printf(catgets(catd, CATSET, 181,
- "Sendmail arguments:"));
diff --git a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
deleted file mode 100644
index 236b33190..000000000
--- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The mailx utility from CentOS"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="net-libs/liblockfile
- dev-libs/libbsd
- sys-libs/binutils-libs
- virtual/mta
- mail-client/mailx-support
- dev-libs/openssl"
-
-RDEPEND="${DEPEND}
- !virtual/mailx
- !mail-client/nail
- !net-mail/mailutils
- !mail-client/mailx"
-
-src_prepare() {
- eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch"
- eapply -p1 "${FILESDIR}/${PN}-${PVR}-enable-ldflags.patch"
- eapply_user
-}
-
-src_compile(){
- sed 's@<openssl@<openssl-1.0/openssl@' -i openssl.c fio.c makeconfig
- emake LDFLAGS="${LDFLAGS}" LDFLAGS+="-L /usr/lib/openssl-1.0/" SENDMAIL=/usr/sbin/sendmail
-}
-
-src_install(){
- emake PREFIX="${D}/usr" SYSCONFDIR="${D}/etc" UCBINSTALL="/usr/bin/install" install
- install -v -m755 -d "${D}/usr/share/doc/heirloom-mailx-12.5"
- install -v -m644 README "${D}/usr/share/doc/heirloom-mailx-12.5"
-}
diff --git a/mail-client/heirloom-mailx/metadata.xml b/mail-client/heirloom-mailx/metadata.xml
deleted file mode 100644
index 3be410e17..000000000
--- a/mail-client/heirloom-mailx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>y0rune@aol.com</email>
- <name>Marcin Woźniak</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 37ed793cb..0ea08a6a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -113,11 +113,6 @@ sys-firmware/pinephone-firmware
# Removal on 2024-10-22.
net-im/ruqola
-# David Roman <davidroman96@gmail.com> (2024-09-21)
-# Dead SRC_URI. Not much maintained downstream
-# Removal on 2024-10-21
-mail-client/heirloom-mailx
-
# Julien Roy <julien@jroy.ca> (2024-03-21)
# sys-libs/libucontext is masked in ::gentoo
sys-libs/gcompat
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-22 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-22 9:27 [gentoo-commits] repo/proj/guru:dev commit in: mail-client/heirloom-mailx/, mail-client/heirloom-mailx/files/, profiles/ David Roman
2024-10-22 9:31 ` [gentoo-commits] repo/proj/guru:master commit in: mail-client/heirloom-mailx/files/, profiles/, mail-client/heirloom-mailx/ David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox