summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-04-22 09:22:08 +0200
committerJeroen Roovers <jer@gentoo.org>2020-04-22 09:23:24 +0200
commitf679322d6a5f44a6a7ba34c379d01737315022fc (patch)
treedcba68729f7e353b770199960c6f2fabef649ffb
parentwww-client/vivaldi: Version 3.0.1874.23_p1 (diff)
downloadgentoo-f679322d6a5f44a6a7ba34c379d01737315022fc.tar.gz
gentoo-f679322d6a5f44a6a7ba34c379d01737315022fc.tar.bz2
gentoo-f679322d6a5f44a6a7ba34c379d01737315022fc.zip
mail-client/mailx: Version 8.1.2.20180807
- New Debian patchset - Fix building with CFLAGS=-fno-common Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://bugs.gentoo.org/706258 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--mail-client/mailx/Manifest2
-rw-r--r--mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch156
-rw-r--r--mail-client/mailx/mailx-8.1.2.20180807.ebuild56
3 files changed, 214 insertions, 0 deletions
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 7a1436c1390..43766c25971 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,2 +1,4 @@
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 bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
+DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
diff --git a/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch b/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch
new file mode 100644
index 00000000000..cfde60d1d57
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch
@@ -0,0 +1,156 @@
+--- a/glob.h
++++ b/glob.h
+@@ -37,48 +37,48 @@
+ * A bunch of global variable declarations lie herein.
+ * def.h must be included first.
+ */
+-int msgCount; /* Count of messages read in */
+-int rcvmode; /* True if receiving mail */
+-int sawcom; /* Set after first command */
+-int senderr; /* An error while checking */
+-int edit; /* Indicates editing a file */
+-int readonly; /* Will be unable to rewrite file */
+-int noreset; /* String resets suspended */
+-int sourcing; /* Currently reading variant file */
+-int loading; /* Loading user definitions */
+-int cond; /* Current state of conditional exc. */
+-FILE *itf; /* Input temp file buffer */
+-FILE *otf; /* Output temp file buffer */
+-int image; /* File descriptor for image of msg */
+-FILE *input; /* Current command input file */
+-char mailname[PATHSIZE]; /* Name of current file */
+-char prevfile[PATHSIZE]; /* Name of previous file */
+-char *homedir; /* Path name of home directory */
+-char *myname; /* My login name */
+-off_t mailsize; /* Size of system mailbox */
+-int lexnumber; /* Number of TNUMBER from scan() */
+-char lexstring[STRINGLEN]; /* String from TSTRING, scan() */
+-int regretp; /* Pointer to TOS of regret tokens */
+-int regretstack[REGDEP]; /* Stack of regretted tokens */
+-char *string_stack[REGDEP]; /* Stack of regretted strings */
+-int numberstack[REGDEP]; /* Stack of regretted numbers */
+-struct message *dot; /* Pointer to current message */
+-struct message *message; /* The actual message structure */
+-struct var *variables[HSHSIZE]; /* Pointer to active var list */
+-struct grouphead *groups[HSHSIZE];/* Pointer to active groups */
+-struct ignoretab ignore[2]; /* ignored and retained fields
+- 0 is ignore, 1 is retain */
+-struct ignoretab saveignore[2]; /* ignored and retained fields
+- on save to folder */
+-struct ignoretab ignoreall[2]; /* special, ignore all headers */
+-char **altnames; /* List of alternate names for user */
+-int debug; /* Debug flag set */
+-int screenwidth; /* Screen width, or best guess */
+-int screenheight; /* Screen height, or best guess,
+- for "header" command */
+-int realscreenheight; /* the real screen height */
+-int uflag; /* Are we in -u mode? */
+-sigset_t intset; /* Signal set that is just SIGINT */
++extern int msgCount; /* Count of messages read in */
++extern int rcvmode; /* True if receiving mail */
++extern int sawcom; /* Set after first command */
++extern int senderr; /* An error while checking */
++extern int edit; /* Indicates editing a file */
++extern int readonly; /* Will be unable to rewrite file */
++extern int noreset; /* String resets suspended */
++extern int sourcing; /* Currently reading variant file */
++extern int loading; /* Loading user definitions */
++extern int cond; /* Current state of conditional exc. */
++extern FILE *itf; /* Input temp file buffer */
++extern FILE *otf; /* Output temp file buffer */
++extern int image; /* File descriptor for image of msg */
++extern FILE *input; /* Current command input file */
++extern char mailname[PATHSIZE]; /* Name of current file */
++extern char prevfile[PATHSIZE]; /* Name of previous file */
++extern char *homedir; /* Path name of home directory */
++extern char *myname; /* My login name */
++extern off_t mailsize; /* Size of system mailbox */
++extern int lexnumber; /* Number of TNUMBER from scan() */
++extern char lexstring[STRINGLEN]; /* String from TSTRING, scan() */
++extern int regretp; /* Pointer to TOS of regret tokens */
++extern int regretstack[REGDEP]; /* Stack of regretted tokens */
++extern char *string_stack[REGDEP]; /* Stack of regretted strings */
++extern int numberstack[REGDEP]; /* Stack of regretted numbers */
++extern struct message *dot; /* Pointer to current message */
++extern struct message *message; /* The actual message structure */
++extern struct var *variables[HSHSIZE]; /* Pointer to active var list */
++extern struct grouphead *groups[HSHSIZE];/* Pointer to active groups */
++extern struct ignoretab ignore[2]; /* ignored and retained fields
++ 0 is ignore, 1 is retain */
++extern struct ignoretab saveignore[2]; /* ignored and retained fields
++ on save to folder */
++extern struct ignoretab ignoreall[2]; /* special, ignore all headers */
++extern char **altnames; /* List of alternate names for user */
++extern int debug; /* Debug flag set */
++extern int screenwidth; /* Screen width, or best guess */
++extern int screenheight; /* Screen height, or best guess,
++ for "header" command */
++extern int realscreenheight; /* the real screen height */
++extern int uflag; /* Are we in -u mode? */
++extern sigset_t intset; /* Signal set that is just SIGINT */
+
+ /*
+ * The pointers for the string allocation routines,
+@@ -87,7 +87,7 @@
+ * twice as much, and so on.
+ */
+ #define NSPACE 25 /* Total number of string spaces */
+-struct strings {
++extern struct strings {
+ char *s_topFree; /* Beginning of this area */
+ char *s_nextFree; /* Next alloctable place here */
+ unsigned s_nleft; /* Number of bytes left here */
+--- a/main.c
++++ b/main.c
+@@ -36,6 +36,51 @@
+ #include "extern.h"
+ #include <locale.h>
+
++int msgCount; /* Count of messages read in */
++int rcvmode; /* True if receiving mail */
++int sawcom; /* Set after first command */
++int senderr; /* An error while checking */
++int edit; /* Indicates editing a file */
++int readonly; /* Will be unable to rewrite file */
++int noreset; /* String resets suspended */
++int sourcing; /* Currently reading variant file */
++int loading; /* Loading user definitions */
++int cond; /* Current state of conditional exc. */
++FILE *itf; /* Input temp file buffer */
++FILE *otf; /* Output temp file buffer */
++int image; /* File descriptor for image of msg */
++FILE *input; /* Current command input file */
++char mailname[PATHSIZE]; /* Name of current file */
++char prevfile[PATHSIZE]; /* Name of previous file */
++char *homedir; /* Path name of home directory */
++char *myname; /* My login name */
++off_t mailsize; /* Size of system mailbox */
++int lexnumber; /* Number of TNUMBER from scan() */
++char lexstring[STRINGLEN]; /* String from TSTRING, scan() */
++int regretp; /* Pointer to TOS of regret tokens */
++int regretstack[REGDEP]; /* Stack of regretted tokens */
++char *string_stack[REGDEP]; /* Stack of regretted strings */
++int numberstack[REGDEP]; /* Stack of regretted numbers */
++struct message *dot; /* Pointer to current message */
++struct message *message; /* The actual message structure */
++struct var *variables[HSHSIZE]; /* Pointer to active var list */
++struct grouphead *groups[HSHSIZE];/* Pointer to active groups */
++struct ignoretab ignore[2]; /* ignored and retained fields
++ 0 is ignore, 1 is retain */
++struct ignoretab saveignore[2]; /* ignored and retained fields
++ on save to folder */
++struct ignoretab ignoreall[2]; /* special, ignore all headers */
++char **altnames; /* List of alternate names for user */
++int debug; /* Debug flag set */
++int screenwidth; /* Screen width, or best guess */
++int screenheight; /* Screen height, or best guess,
++ for "header" command */
++int realscreenheight; /* the real screen height */
++int uflag; /* Are we in -u mode? */
++sigset_t intset; /* Signal set that is just SIGINT */
++
++struct strings stringdope[NSPACE];
++
+ static void usage(void);
+ int main(int, char **);
+
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
new file mode 100644
index 00000000000..48401bc4694
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
+DPT="${DP}.orig.tar.xz"
+DPP="${DP}-1.debian.tar.xz"
+
+DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
+HOMEPAGE="https://www.debian.org/"
+SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
+ http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
+
+S="${WORKDIR}/${DP/_/-}.orig"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND=">=net-libs/liblockfile-1.03
+ dev-libs/libbsd
+ virtual/mta
+ mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+ !mail-client/nail
+ !net-mail/mailutils"
+
+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_user
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin mail
+
+ 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
+ insinto /etc
+ doins misc/mail.rc
+}