diff options
author | Eray Aslan <eras@gentoo.org> | 2020-05-13 09:50:22 +0300 |
---|---|---|
committer | Eray Aslan <eras@gentoo.org> | 2020-05-13 09:51:07 +0300 |
commit | e3af573c26166f7ea1a1e4aeec071866417a3d1a (patch) | |
tree | b46776d559f0e5543bc94ae93f6f669dee3c507e /net-mail/mailutils/files | |
parent | dev-lang/swi-prolog: bump development version (diff) | |
download | gentoo-e3af573c26166f7ea1a1e4aeec071866417a3d1a.tar.gz gentoo-e3af573c26166f7ea1a1e4aeec071866417a3d1a.tar.bz2 gentoo-e3af573c26166f7ea1a1e4aeec071866417a3d1a.zip |
net-mail/mailutils: cleanup
Bug: https://bugs.gentoo.org/700806
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Eray Aslan <eras@gentoo.org>
Diffstat (limited to 'net-mail/mailutils/files')
-rw-r--r-- | net-mail/mailutils/files/hdr.at | 36 | ||||
-rw-r--r-- | net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch | 70 | ||||
-rw-r--r-- | net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch | 122 | ||||
-rw-r--r-- | net-mail/mailutils/files/mailutils-3.4-fno-common.patch | 11 | ||||
-rw-r--r-- | net-mail/mailutils/files/nohdr.at | 26 | ||||
-rw-r--r-- | net-mail/mailutils/files/twomsg.at | 73 | ||||
-rw-r--r-- | net-mail/mailutils/files/weed.at | 29 |
7 files changed, 0 insertions, 367 deletions
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at deleted file mode 100644 index 7c9d5e85c693..000000000000 --- a/net-mail/mailutils/files/hdr.at +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of GNU Mailutils. -*- Autotest -*- -# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc. -# -# GNU Mailutils is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 3, or (at -# your option) any later version. -# -# GNU Mailutils is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. - -READMSGTEST([readmsg -h],[hdr], -[readmsg -h SOMETHING], -[0], -[From bar@dontmailme.org Fri Dec 28 23:28:09 2001 -Received: (from bar@dontmailme.org) - by dontmailme.org id fERKR9N16790 - for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200 -Date: Fri, 28 Dec 2001 23:28:08 +0200 -From: Bar <bar@dontmailme.org> -To: Foo Bar <foobar@nonexistent.net> -Message-Id: <200112232808.fERKR9N16790@dontmailme.org> -Subject: Re: Jabberwocky - -It seems very pretty, but it's *rather* hard to understand!' -Somehow it seems to fill my head with ideas -- only I don't -exactly know what they are! However, SOMEBODY killed SOMETHING: -that's clear, at any rate... - - -]) diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch deleted file mode 100644 index 919b6619e5f1..000000000000 --- a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <gray@gnu.org> -Date: Fri, 10 Nov 2017 21:28:17 +0200 -Subject: Minor fix in MH testsuite - -Running fmtcheck without .mh_profile triggers mh_install, which -surprises the testsuite with unexpected output "I'm going to -create the standard MH path for you." Defining the MH envar to -an existing file name suppresses it. - -* mh/tests/fmtcnd00.at: Always define MH prior to starting fmtcheck. -* mh/tests/fmtcomp.at: Likewise. -* mh/tests/fmtfunc.at: Likewise. ---- - mh/tests/fmtcnd00.at | 2 +- - mh/tests/fmtcomp.at | 4 ++-- - mh/tests/fmtfunc.at | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mh/tests/fmtcnd00.at b/mh/tests/fmtcnd00.at -index 507e8e5..f674d41 100644 ---- a/mh/tests/fmtcnd00.at -+++ b/mh/tests/fmtcnd00.at -@@ -28,7 +28,7 @@ m4_pushdef([FMTCOND],[ - AT_SETUP([$1]) - AT_KEYWORDS([format fmtcond fmtcnd00]) - AT_DATA([msg],[$2]) --AT_CHECK([fmtcheck -format 'FORMAT' msg -+AT_CHECK([MH=/dev/null fmtcheck -format 'FORMAT' msg - ], - [0], - [$3]) -diff --git a/mh/tests/fmtcomp.at b/mh/tests/fmtcomp.at -index 72cd823..615470a 100644 ---- a/mh/tests/fmtcomp.at -+++ b/mh/tests/fmtcomp.at -@@ -22,7 +22,7 @@ dnl - m4_pushdef([FMTCOMP],[ - AT_SETUP([$1]) - AT_KEYWORDS([format fmtcomp]) --AT_CHECK([fmtcheck -disass -dump -format '$2' -+AT_CHECK([MH=/dev/null fmtcheck -disass -dump -format '$2' - ], - [m4_if([$4],[],[0],[1])], - [$3],[$4]) -@@ -296,7 +296,7 @@ m4_pushdef([FMTCOMP],[ - AT_SETUP([$1]) - AT_KEYWORDS([format fmtdiag]) - AT_DATA([input.fmt],[$2]) --AT_CHECK([fmtcheck -form input.fmt -+AT_CHECK([MH=/dev/null fmtcheck -form input.fmt - ], - [1], - [], -diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at -index 844a777..0829d45 100644 ---- a/mh/tests/fmtfunc.at -+++ b/mh/tests/fmtfunc.at -@@ -212,7 +212,7 @@ AT_DATA([input.fmt],[%(getenv MH_TEST) - AT_DATA([message],[ - - ]) --AT_CHECK([MH_TEST=defined fmtcheck -form input.fmt -width 80 message -+AT_CHECK([MH=/dev/null MH_TEST=defined fmtcheck -form input.fmt -width 80 message - ], - [0], - [defined --- -cgit v1.0-41-gc330 - diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch deleted file mode 100644 index 0e52fae20c1b..000000000000 --- a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch +++ /dev/null @@ -1,122 +0,0 @@ -From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <gray@gnu.org> -Date: Thu, 21 Jun 2018 09:46:43 +0300 -Subject: Fix endianness bug in string to IP conversion - -* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes) -(_mu_sockaddr_to_bytes): Fix improper endianness conversion. -* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion. ---- - libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++------------------------- - libmailutils/cidr/tosa.c | 9 ++------- - 2 files changed, 22 insertions(+), 32 deletions(-) - -diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c -index f57aadc..39d24fd 100644 ---- a/libmailutils/cidr/fromsa.c -+++ b/libmailutils/cidr/fromsa.c -@@ -29,55 +29,50 @@ - #include <mailutils/cidr.h> - #include <mailutils/errno.h> - --static void --uint32_to_bytes (unsigned char *bytes, uint32_t u) --{ -- int i; -- -- for (i = 0; i < 4; i++) -- { -- bytes[i] = u & 0xff; -- u >>= 8; -- } --} -- - int - _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes) - { -- uint32_t u; -+ size_t len; - - switch (af) - { - case AF_INET: -- memcpy (&u, buf, sizeof u); -- uint32_to_bytes (bytes, u); -- return 4; -- -+ len = 4; -+ break; -+ - #ifdef MAILUTILS_IPV6 - case AF_INET6: -- memcpy (bytes, buf, 16); -- return 16; -+ len = 16; -+ break; - #endif -+ -+ default: -+ len = 0; - } -- return 0; -+ memcpy (bytes, buf, len); -+ return len; - } - - int - _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa) - { -+ void *buf; - switch (sa->sa_family) - { - case AF_INET: -- uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr); -- return 4; -+ buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr); -+ break; - - #ifdef MAILUTILS_IPV6 - case AF_INET6: -- memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16); -- return 16; -+ buf = &(((struct sockaddr_in6*)sa)->sin6_addr); -+ break; - #endif -+ -+ default: -+ return 0; - } -- return 0; -+ return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes); - } - - int -diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c -index 33715e1..2b372b1 100644 ---- a/libmailutils/cidr/tosa.c -+++ b/libmailutils/cidr/tosa.c -@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa) - } addr; - struct sockaddr *sa; - int socklen; -- int i; -- -+ - memset (&addr, 0, sizeof (addr)); - addr.sa.sa_family = cidr->family; - switch (cidr->family) - { - case AF_INET: - socklen = sizeof (addr.s_in); -- for (i = 0; i < cidr->len; i++) -- { -- addr.s_in.sin_addr.s_addr <<= 8; -- addr.s_in.sin_addr.s_addr |= cidr->address[i]; -- } -+ memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4); - break; - - #ifdef MAILUTILS_IPV6 --- -cgit v1.0-41-gc330 - diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch deleted file mode 100644 index d981ae6891a8..000000000000 --- a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/tcpwrap.h -+++ b/lib/tcpwrap.h -@@ -18,7 +18,7 @@ - #include <mailutils/types.h> - - extern int mu_tcp_wrapper_enable; --const char *mu_tcp_wrapper_daemon; -+extern const char *mu_tcp_wrapper_daemon; - extern int mu_tcpwrapper_access (int fd); - extern void mu_tcpwrapper_cfg_init (void); - extern int mu_tcp_wrapper_prefork (int fd, diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at deleted file mode 100644 index 4caf85570f1e..000000000000 --- a/net-mail/mailutils/files/nohdr.at +++ /dev/null @@ -1,26 +0,0 @@ -# This file is part of GNU Mailutils. -*- Autotest -*- -# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc. -# -# GNU Mailutils is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 3, or (at -# your option) any later version. -# -# GNU Mailutils is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. - -READMSGTEST([readmsg -n],[nohdr], -[readmsg -n SOMETHING], -[0], -[It seems very pretty, but it's *rather* hard to understand!' -Somehow it seems to fill my head with ideas -- only I don't -exactly know what they are! However, SOMEBODY killed SOMETHING: -that's clear, at any rate... - - -]) diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at deleted file mode 100644 index 20af66173d6a..000000000000 --- a/net-mail/mailutils/files/twomsg.at +++ /dev/null @@ -1,73 +0,0 @@ -# This file is part of GNU Mailutils. -*- Autotest -*- -# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc. -# -# GNU Mailutils is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 3, or (at -# your option) any later version. -# -# GNU Mailutils is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. - -READMSGTEST([readmsg 1 2],[twomsg], -[1 2], -[0], -[Date: Fri, 28 Dec 2001 22:18:08 +0200 -From: Foo Bar <foobar@nonexistent.net> -To: Bar <bar@dontmailme.org> -Subject: Jabberwocky - -`Twas brillig, and the slithy toves -Did gyre and gimble in the wabe; -All mimsy were the borogoves, -And the mome raths outgrabe. - -`Beware the Jabberwock, my son! -The jaws that bite, the claws that catch! -Beware the Jujub bird, and shun -The frumious Bandersnatch!' - -He took his vorpal sword in hand: -Long time the manxome foe he sought -- -So rested he by the Tumtum gree, -And stood awhile in thought. - -And as in uffish thought he stood, -The Jabberwock, with eyes of flame, -Came whiffling through the tulgey wook, -And burbled as it came! - -One, two! One, two! And through and through -The vorpal blade went snicker-snack! -He left it dead, and with its head -He went galumphing back. - -`And has thou slain the Jabberwock? -Come to my arms, my beamish boy! -O frabjous day! Calloh! Callay! -He chortled in his joy. - -`Twas brillig, and the slithy toves -Did gyre and gimble in the wabe; -All mimsy were the borogoves, -And the mome raths outgrabe. - - -Date: Fri, 28 Dec 2001 23:28:08 +0200 -From: Bar <bar@dontmailme.org> -To: Foo Bar <foobar@nonexistent.net> -Subject: Re: Jabberwocky - -It seems very pretty, but it's *rather* hard to understand!' -Somehow it seems to fill my head with ideas -- only I don't -exactly know what they are! However, SOMEBODY killed SOMETHING: -that's clear, at any rate... - - -]) - diff --git a/net-mail/mailutils/files/weed.at b/net-mail/mailutils/files/weed.at deleted file mode 100644 index ec82c6ce23b5..000000000000 --- a/net-mail/mailutils/files/weed.at +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of GNU Mailutils. -*- Autotest -*- -# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc. -# -# GNU Mailutils is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 3, or (at -# your option) any later version. -# -# GNU Mailutils is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. - -READMSGTEST([readmsg -w],[weed], -[-w date,subject SOMETHING], -[0], -[Date: Fri, 28 Dec 2001 23:28:08 +0200 -Subject: Re: Jabberwocky - -It seems very pretty, but it's *rather* hard to understand!' -Somehow it seems to fill my head with ideas -- only I don't -exactly know what they are! However, SOMEBODY killed SOMETHING: -that's clear, at any rate... - - -]) |