23209582 Upgrade fetchmail to 6.3.26
authorRich Burridge <rich.burridge@oracle.com>
Tue, 05 Jul 2016 11:43:57 -0700
changeset 6348 6933441922fe
parent 6347 545ae06d138d
child 6349 00824654920d
23209582 Upgrade fetchmail to 6.3.26
components/fetchmail/Makefile
components/fetchmail/fetchmail.license
components/fetchmail/fetchmail.p5m
components/fetchmail/patches/16390176.patch
components/fetchmail/test/results-64.master
--- a/components/fetchmail/Makefile	Tue Jul 05 11:15:27 2016 -0700
+++ b/components/fetchmail/Makefile	Tue Jul 05 11:43:57 2016 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		fetchmail
-COMPONENT_VERSION=	6.3.22
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_VERSION=	6.3.26
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:09093168552119e962617f86f2713564cf6e3fe7fd32d6799aa0b87df28f1e89
-COMPONENT_ARCHIVE_URL=	http://download.berlios.de/fetchmail/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://fetchmail.berlios.de/
+    sha256:79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850
+COMPONENT_ARCHIVE_URL=	https://sourceforge.net/projects/$(COMPONENT_NAME)/files/branch_6.3/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.fetchmail.info/
 
-TPNO=			8416
+TPNO=			29615
 
 include $(WS_MAKE_RULES)/common.mk
 
@@ -50,8 +50,13 @@
 	$(PROTO_DIR)$(USRBIN.32)/fetchmailconf
 
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|"' \
-	'-e "/^XXX_CC_XXX$$/d"'
+	'-n ' \
+	'-e "/SKIP/p" ' \
+	'-e "/PASS/p" ' \
+	'-e "/FAIL/p" ' \
+	'-e "/^=======/p" ' \
+	'-e "/were not run/p" ' \
+	'-e "/passed/p" '
 
 REQUIRED_PACKAGES += library/python/tkinter-27
 REQUIRED_PACKAGES += library/security/openssl
--- a/components/fetchmail/fetchmail.license	Tue Jul 05 11:15:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-This collective work is
-Copyright (C) 2002, 2003 Eric S. Raymond
-Copyright (C) 2004 Matthias Andree, Eric S. Raymond,
-                   Robert M. Funk, Graham Wilson
-Copyright (C) 2005 - 2006, 2010 Sunil Shetye
-Copyright (C) 2005 - 2010 Matthias Andree
-
-If enabled at configure/compile time, the following clause applies:
-| This product includes software developed by the OpenSSL Project
-| for use in the OpenSSL Toolkit. (http://www.openssl.org/)
-
-Some older portions not explicitly mentioned above are copyrighted by
-Carl E. Harris, George M. Sipe, Graham Wilson, Matthias Andree and Sunil Shetye.
-
-The support for SMB authentication is copyright by Andrew Tridgell and
-is under GPL version 2 (or any later version).  Andrew Tridgell has
-granted a specific exemption for his GPL-licensed code to be linked with
-non-GPL-compliant code in fetchmail.  The relevant files are smb*.[ch]
-and ntlm.h.
-
-The following files are public-domain: acconfig.h, md5c.c, md5.h.
-
-The following files are explicitly GPL-licensed (v2 or any later
-version): getopt1.c, getopt.c, getopt.h.
-
-The file m4-local/ac_ma_search_package.m4 is copyright by Caolan
-McNamara <[email protected]> with fixes from Alexandre Duret-Lutz
-<[email protected]>, Matthew Mueller <[email protected]> and
-Matthias Andree <[email protected]>
-The license is detailed in m4-local/ac-archive-license.txt and is a
-relaxed GPLv2-or-later version.
-
-The *.c files in the ucs/ directory are Copyright (C) 2002, 2003 by
-Markus Kuhn, with a liberal license as follows:
- | Permission to use, copy, modify, and distribute this software
- | for any purpose and without fee is hereby granted. The author
- | disclaims all warranties with regard to this software.
-
-The trio/ code is Copyright (C) 1998-2001 by Bjorn Reese and Daniel
-Stenberg and also under a liberal license:
- | Permission to use, copy, modify, and distribute this software for any
- | purpose with or without fee is hereby granted, provided that the above
- | copyright notice and this permission notice appear in all copies.
- |
- | THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- | WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- | MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- | CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
-
-The m4/gethostbyname_r.m4 and libesmtp/* files functions are (C) by
-Brian Stafford, see the respective file headers for details (LGPL v2.1
-or later).
-
-The KAME/* files are (C) Copyright (C) 1995, 1996, 1997, and 1998 WIDE
-Project, see the respective file headers for details.
-
-All other code in the distribution incorporates the copy of GPL version 2
-below by reference.
-
-Specific permission is granted for the GPLed code in this distribition to
-be linked to OpenSSL without invoking GPL clause 2(b).
-
--------------------------------------------------------------------------------
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
--------------------------------------------------------------------------------
--- a/components/fetchmail/fetchmail.p5m	Tue Jul 05 11:15:27 2016 -0700
+++ b/components/fetchmail/fetchmail.p5m	Tue Jul 05 11:43:57 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -44,6 +44,7 @@
 file path=usr/share/locale/de/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/el/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/en_GB/LC_MESSAGES/fetchmail.mo
+file path=usr/share/locale/eo/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/es/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/fi/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/fr/LC_MESSAGES/fetchmail.mo
@@ -63,4 +64,4 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
 file path=usr/share/man/man1/fetchmail.1
 file path=usr/share/man/man1/fetchmailconf.1
-license fetchmail.license license=GPLv2
+license COPYING license=GPLv2
--- a/components/fetchmail/patches/16390176.patch	Tue Jul 05 11:15:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# This patch should be removed when we upgrade to 6.3.25; see the bug report
-# for full context.
---- fetchmail/socket.c.orig	2012-08-13 13:02:41.000000000 -0700
-+++ fetchmail/socket.c	2013-02-11 15:44:05.297674654 -0800
-@@ -133,6 +133,7 @@
- 	argvec = (char **)malloc(s);
- 	if (!argvec)
- 	{
-+		free(plugin_copy);
- 		report(stderr, GT_("fetchmail: malloc failed\n"));
- 		return NULL;
- 	}
-@@ -186,6 +187,8 @@
- 		if (outlevel >= O_VERBOSE)
- 		    report(stderr, GT_("running %s (host %s service %s)\n"), plugin, host, service);
- 		argvec = parse_plugin(plugin,host,service);
-+		if (argvec == NULL)
-+			_exit(EXIT_FAILURE);
- 		execvp(*argvec, argvec);
- 		report(stderr, GT_("execvp(%s) failed\n"), *argvec);
- 		_exit(EXIT_FAILURE);
--- a/components/fetchmail/test/results-64.master	Tue Jul 05 11:15:27 2016 -0700
+++ b/components/fetchmail/test/results-64.master	Tue Jul 05 11:43:57 2016 -0700
@@ -1,31 +1,3 @@
-make[1]: Entering directory `$(@D)'
-/usr/gnu/bin/make  check-recursive
-make[2]: Entering directory `$(@D)'
-Making check in .
-make[3]: Entering directory `$(@D)'
-/usr/gnu/bin/make   rfc822 unmime netrc rfc2047e mxget rfc822valid x509_name_match
-make[4]: Entering directory `$(@D)'
-source='rfc822.c' object='rfc822-rfc822.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='unmime.c' object='unmime-unmime.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='netrc.c' object='netrc-netrc.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='xmalloc.c' object='netrc-xmalloc.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='report.c' object='netrc-report.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='rfc2047e.c' object='rfc2047e-rfc2047e.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='mxget.c' object='mxget-mxget.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='rfc822valid.c' object='rfc822valid-rfc822valid.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-source='x509_name_match.c' object='x509_name_match-x509_name_match.o' libtool=no \
-DEPDIR=.deps depmode=none /usr/xpg4/bin/sh $(SOURCE_DIR)/depcomp \
-make[4]: Leaving directory `$(@D)'
-/usr/gnu/bin/make  check-TESTS
-make[4]: Entering directory `$(@D)'
 PASS: t.smoke
 SKIP: t.validate-xhtml10
 SKIP: t.validate-xhtml
@@ -34,10 +6,3 @@
 All 2 tests passed
 (2 tests were not run)
 ======================
-make[4]: Leaving directory `$(@D)'
-make[3]: Leaving directory `$(@D)'
-Making check in po
-make[3]: Entering directory `$(@D)/po'
-make[3]: Leaving directory `$(@D)/po'
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'